Merge branch 'master' of github.com:roundcube/roundcubemail

154 files changed, 1429 insertions, 13541 deletions

diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index bce4cd4e2..f9a62f010 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -48,6 +48,8 @@ class rcube_imap_generic
         '*'        => '\\*',
     );
 
+    public static $mupdate;
+
     private $fp;
     private $host;
     private $logged = false;
@@ -3156,6 +3158,11 @@ class rcube_imap_generic
         }
 
         foreach ($data as $entry) {
+            // Workaround cyrus-murder bug, the entry[2] string needs to be escaped
+            if (self::$mupdate) {
+                $entry[2] = addcslashes($entry[2], '\\"');
+            }
+
             // ANNOTATEMORE drafts before version 08 require quoted parameters
             $entries[] = sprintf('%s (%s %s)', $this->escape($entry[0], true),
                 $this->escape($entry[1], true), $this->escape($entry[2], true));
@@ -3720,6 +3727,10 @@ class rcube_imap_generic
             $this->prefs['literal+'] = true;
         }
 
+        if (preg_match('/(\[| )MUPDATE=.*/', $str)) {
+            self::$mupdate = true;
+        }
+
         if ($trusted) {
             $this->capability_readed = true;
         }
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 377e1352f..4100f7c4a 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'مرحباً بكم في $product';
 $labels['username']  = 'اسم المستخدم';
 $labels['password']  = 'كلمة المرور';
 $labels['server']    = 'الخادم';
 $labels['login']     = 'تسجيل الدخول';
-
-// taskbar
 $labels['logout']   = 'تسجيل الخروج';
 $labels['mail']     = 'البريد';
 $labels['settings'] = 'الإعدادات الشخصية';
 $labels['addressbook'] = 'دفتر العناوين';
-
-// mailbox names
 $labels['inbox']  = 'الوارد';
 $labels['drafts'] = 'المسودات';
 $labels['sent']   = 'المرسل';
 $labels['trash']  = 'المهملات';
 $labels['junk']   = 'غير المرغوب';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'الموضوع';
 $labels['from']    = 'المرسل';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'المستقبل';
 $labels['cc']      = 'نسخة';
 $labels['bcc']     = 'نسخة مخفية';
@@ -53,28 +41,18 @@ $labels['size']    = 'الحجم';
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
 $labels['open']     = 'فتح';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
-
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
-
-// weekdays short
 $labels['sun'] = 'أحد';
 $labels['mon'] = 'إثنين';
 $labels['tue'] = 'ثلاثاء';
@@ -82,8 +60,6 @@ $labels['wed'] = 'أربعاء';
 $labels['thu'] = 'خميس';
 $labels['fri'] = 'جمعة';
 $labels['sat'] = 'سبت';
-
-// weekdays long
 $labels['sunday']    = 'الأحد';
 $labels['monday']    = 'الإثنين';
 $labels['tuesday']   = 'الثلاثاء';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'الأربعاء';
 $labels['thursday']  = 'الخميس';
 $labels['friday']    = 'الجمعة';
 $labels['saturday']  = 'السبت';
-
-// months short
 $labels['jan']	= 'يناير';
 $labels['feb']	= 'فبراير';
 $labels['mar']	= 'مارس';
@@ -105,8 +79,6 @@ $labels['sep']	= 'سبتمبر';
 $labels['oct']	= 'أكتوبر';
 $labels['nov']	= 'نوفمبر';
 $labels['dec']	= 'ديسمبر';
-
-// months long
 $labels['longjan']	= 'يناير';
 $labels['longfeb']	= 'فبراير';
 $labels['longmar']	= 'مارس';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'سبتمبر';
 $labels['longoct']	= 'أكتوبر';
 $labels['longnov']	= 'نوفمبر';
 $labels['longdec']	= 'ديسمبر';
-
 $labels['today'] = 'اليوم';
-
-// toolbar buttons
 $labels['refresh']          = 'تحديث';
 $labels['checkmail']        = 'التحقق من وجود رسائل جديدة';
 $labels['compose']          = 'إنشاء رسالة';
@@ -155,7 +124,6 @@ $labels['moreactions']      = 'إجراءات إضافية...';
 $labels['more']             = 'المزيد';
 $labels['back']             = 'العودة';
 $labels['options']          = 'خيارات';
-
 $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
 $labels['none'] = 'لاشيء';
@@ -174,7 +142,6 @@ $labels['expand-all'] = 'إظهار الكل';
 $labels['expand-unread'] = 'إظهار الغير مقروءة';
 $labels['collapse-all'] = 'ضمّ الكل';
 $labels['threaded'] = 'متتابع';
-
 $labels['autoexpand_threads'] = 'إظهار تتابعات الرسائل';
 $labels['do_expand'] = 'جميع التتابعات';
 $labels['expand_only_unread'] = 'فقط مع الرسائل الغير مقروءة';
@@ -190,30 +157,18 @@ $labels['listcolumns'] = 'أعمدة السرد';
 $labels['listsorting'] = 'أعمدة الترتيب';
 $labels['listorder'] = 'طريقة الترتيب';
 $labels['listmode'] = 'وضع طريقة السرد';
-
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'المساحة المستخدمة';
 $labels['unknown']  = 'مجهول';
 $labels['unlimited']  = 'غير محدود';
-
 $labels['quicksearch']  = 'البحث السريع';
 $labels['resetsearch']  = 'استعادة البحث للافتراضي';
 $labels['searchmod']  = 'أماكن البحث';
 $labels['msgtext']  = 'كامل الرسالة';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['namex'] = 'Name';
-
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'تعديل كجديد';
 $labels['send']           = 'ارسل';
 $labels['sendmessage']    = 'إرسال الرسالة الآن';
@@ -225,52 +180,40 @@ $labels['returnreceipt']  = 'ايصال استلام';
 $labels['dsn']            = 'تنويه حالة التوصيل';
 $labels['mailreplyintro'] = 'كتب $sender في $date:';
 $labels['originalmessage'] = 'الرسالة الأساسية';
-
 $labels['editidents']    = 'تعديل الهويات';
 $labels['spellcheck']    = 'التدقيق اﻹملائى';
 $labels['checkspelling'] = 'التدقيق الإملائي';
 $labels['resumeediting'] = 'متابعة التحرير';
 $labels['revertto']      = 'استعادة إلى';
-
 $labels['attach'] = 'إرفاق';
 $labels['attachments'] = 'مرفقات';
 $labels['upload'] = 'تحميل';
 $labels['uploadprogress'] = '$percent ($current من $total)';
 $labels['close']  = 'إغلاق';
 $labels['messageoptions']  = 'خيارات الرسائل...';
-
 $labels['low']     = 'منخض';
 $labels['lowest']  = 'الأقل';
 $labels['normal']  = 'عادي';
 $labels['high']    = 'مرتفع';
 $labels['highest'] = 'الأعلى';
-
 $labels['nosubject']  = '(دون موضوع)';
 $labels['showimages'] = 'إظهار الصور';
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
 $labels['isdraft']    = 'هذه مسودّة رسالة';
 $labels['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'] = 'ملاحظة: يُعلمك هذا الإيصال بأن رسالتك قد ظهرت على جهاز المستقبِل. ليست هناك أية ضمانات أن المستقبل قد قرأ أو فهم محتويات الرسالة.';
-
-// address boook
 $labels['name']         = 'اسم العرض';
 $labels['firstname']    = 'الإسم الأول';
 $labels['surname']      = 'الإسم الأخير';
@@ -305,7 +248,6 @@ $labels['search'] = 'بحث';
 $labels['advsearch'] = 'بحث متقدم';
 $labels['advanced'] = 'مُتقدم';
 $labels['other'] = 'آخر';
-
 $labels['typehome']   = 'المنزل';
 $labels['typework']   = 'العمل';
 $labels['typeother']  = 'آخر';
@@ -320,14 +262,12 @@ $labels['typeassistant']  = 'المساعد';
 $labels['typehomepage']  = 'الرئيسية';
 $labels['typeblog'] = 'المدوّنة';
 $labels['typeprofile'] = 'الملف الشخصي';
-
 $labels['addfield'] = 'إضافة حقل...';
 $labels['addcontact'] = 'إضافة المراسل المحدد إلى دفتر عناويني';
 $labels['editcontact'] = 'تحرير بيانات المراسل';
 $labels['contacts'] = 'المراسلين';
 $labels['contactproperties'] = 'خواص جهة الإتصال';
 $labels['personalinfo'] = 'المعلومات الشخصية';
-
 $labels['edit']   = 'تحرير';
 $labels['cancel'] = 'إلغاء';
 $labels['save']   = 'حفظ';
@@ -336,7 +276,6 @@ $labels['rename'] = 'إعادة التسمية';
 $labels['addphoto'] = 'إضافة';
 $labels['replacephoto'] = 'استبدال';
 $labels['uploadphoto'] = 'ارفع صورة';
-
 $labels['newcontact']     = 'إنشاء بطاقة مراسل جديدة';
 $labels['deletecontact']  = 'حذف المراسلين المحددين';
 $labels['composeto']      = 'إنشاء رسالة إليه';
@@ -344,55 +283,38 @@ $labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
 $labels['print']          = 'طباعة';
 $labels['export']         = 'تصدير';
 $labels['exportall']      = 'تصدير الكل';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
 $labels['grouprename']    = 'تغيير اسم المجموعة';
 $labels['groupdelete']    = 'حذف المجموعة';
 $labels['groupremoveselected'] = 'حذف العنوان المختار من المجموعة';
-
 $labels['previouspage']   = 'عرض المجموعة السابقة';
 $labels['firstpage']      = 'عرض المجموعة الأولى';
 $labels['nextpage']       = 'عرض المجموعة التالية';
 $labels['lastpage']       = 'عرض المجموعة الأخيرة';
-
 $labels['group'] = 'مجموعة';
 $labels['groups'] = 'المجموعات';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'العناوين الشخصية';
-
 $labels['searchsave'] = 'حفظ البحث';
 $labels['searchdelete'] = 'حذف البحث';
-
 $labels['import'] = 'استورد';
 $labels['importcontacts'] = 'استورد المراسلين';
 $labels['importfromfile'] = 'استورد من ملف:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
-$labels['importgroupsexisting'] = 'Only for existing groups';
-$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'] = 'نسق الوقت';
@@ -408,9 +330,7 @@ $labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
 $labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'توقيع HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
 $labels['logoutclear'] = 'إفراغ سلة المحذوفات عند الخروج';
@@ -428,14 +348,12 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'أبداً';
 $labels['immediately']  = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
@@ -449,15 +367,12 @@ $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'] = 'إزالة التوقيع من الرسالة عند الرد';
@@ -470,21 +385,13 @@ $labels['afternseconds']  = 'بعد $n ثواني';
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
 $labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
-$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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'مجلد';
 $labels['folders']  = 'مجلدات';
 $labels['foldername']  = 'اسم المجلد';
@@ -505,26 +412,19 @@ $labels['foldertype'] = 'نوع المجلد';
 $labels['personalfolder']  = 'مجلد خاص';
 $labels['otherfolder']  = 'مجلد مستخدم آخر';
 $labels['sharedfolder']  = 'مجلد عام';
-
 $labels['sortby'] = 'ترتيب بحسب';
 $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'] = 'الغرب أوروبية';
@@ -543,5 +443,4 @@ $labels['vietnamese'] = 'الفيتنامية';
 $labels['japanese'] = 'اليابانية';
 $labels['korean'] = 'الكورية';
 $labels['chinese'] = 'الصينية';
-
 ?>
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index f989867de..7d9a7ac62 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -15,9 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
@@ -25,17 +22,12 @@ $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
 $messages['dberror'] = 'خطأ في قاعدة البيانات!';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
 $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري رفع الملف...';
 $messages['uploadingmany'] = 'جاري تحميل الملفات...';
@@ -56,8 +48,6 @@ $messages['contactnotfound'] = 'تعذر العثور على المراسل ال
 $messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور علىالمُراسلين';
 $messages['sendingfailed'] = 'فشل إرسال الرسالة';
 $messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسال هذه الرسالة';
-$messages['errorsavingsent'] = 'حدث خطأ أثناء حفظ الرسالة المُرسلة';
-$messages['errorsaving'] = 'حدث خطأ أثناء الحفظ';
 $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
 $messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
@@ -101,36 +91,26 @@ $messages['converting'] = 'إزالة التنسيق من الرسالة...';
 $messages['messageopenerror'] = 'تعذرت قراءة الرسالة من الخادم';
 $messages['fileuploaderror'] = 'فشل رفع الملف';
 $messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجمالأقصى $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
 $messages['errorsavingcontact'] = 'تعذر حفظ عنوان المراسل';
 $messages['movingmessage'] = 'جاري نقل الرسالة...';
 $messages['copyingmessage'] = 'جاري نسخ الرسالة...';
 $messages['copyingcontact'] = 'جاري نسخ المُراسلين...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'جاري حذف الرسائل...';
 $messages['markingmessage'] = 'جاري تحديد الرسائل...';
 $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
 $messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد فيالهويّة المنتقاة';
 $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
@@ -144,7 +124,6 @@ $messages['smtperror'] = 'خطأ SMTP: $msg';
 $messages['emailformaterror'] = 'عنوان بريد إلكتروني غير صالح: $email';
 $messages['toomanyrecipients'] = 'عدد المرسل إليهم كبير. قلص العدد إلى $max.';
 $messages['maxgroupmembersreached'] = 'عدد أعضاء المجموعة أكثر من $max';
-$messages['internalerror'] = 'حدث خطأ داخلي. الرجاء المحاولة مرة أخرى';
 $messages['contactdelerror'] = 'تعذر حذف أسماء جهات الإتصال';
 $messages['contactdeleted'] = 'تم حذف أسماء جهات الإتصال بنجاح';
 $messages['contactrestoreerror'] = 'تعذر استعادة المُراسل المحذوف.';
@@ -170,7 +149,4 @@ $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 d92aa3d61..7a60238b7 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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'] = 'Axustes';
 $labels['addressbook'] = 'Llibreta de direiciones';
-
-// mailbox names
 $labels['inbox']  = 'Entrantes';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Unviaos';
 $labels['trash']  = 'Papelera';
 $labels['junk']   = 'Puxarra';
 $labels['show_real_foldernames'] = 'Amosar nomes reales pa carpetes especiales';
-
-// message listing
 $labels['subject'] = 'Asuntu';
 $labels['from']    = 'De';
 $labels['sender']  = 'Remitente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioridá';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Lleer estáu';
 $labels['listoptions'] = 'Llista d\'oopciones...';
-
 $labels['mailboxlist'] = 'Bandexes';
 $labels['messagesfromto'] = 'Mensaxes del $from a $to de $count';
 $labels['threadsfromto'] = 'Filos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-
 $labels['copy']     = 'Copia';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'mover a...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Amosar';
 $labels['showanyway'] = 'Amosar de toes formes';
-
 $labels['filename'] = 'Nome del Ficheru';
 $labels['filesize'] = 'Tamañu del ficheru';
-
 $labels['addtoaddressbook'] = 'Amestar a la llibreta de direiciones';
-
-// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Llu';
 $labels['tue'] = 'Mar';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Xue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sab';
-
-// weekdays long
 $labels['sunday']    = 'Domingu';
 $labels['monday']    = 'Llunes';
 $labels['tuesday']   = 'Martes';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Miércoles';
 $labels['thursday']  = 'Xueves';
 $labels['friday']    = 'Vienres';
 $labels['saturday']  = 'Sábadu';
-
-// months short
 $labels['jan']	= 'Xin';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Set';
 $labels['oct']	= 'Och';
 $labels['nov']	= 'Pay';
 $labels['dec']	= 'Avi';
-
-// months long
 $labels['longjan']	= 'Xineru';
 $labels['longfeb']	= 'Febreru';
 $labels['longmar']	= 'Marzu';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Setiembre';
 $labels['longoct']	= 'Ochobre';
 $labels['longnov']	= 'Payares';
 $labels['longdec']	= 'Avientu';
-
 $labels['today'] = 'Güei';
-
-// toolbar buttons
 $labels['refresh']          = 'Refrescar';
 $labels['checkmail']        = 'Buscar mensaxes nuevos';
 $labels['compose']          = 'Escribir un mensaxe';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Más aiciones...';
 $labels['more']             = 'Más';
 $labels['back']             = 'Volver';
 $labels['options']          = 'Opciones';
-
 $labels['select'] = 'Escoyer';
 $labels['all'] = 'Toos';
 $labels['none'] = 'Dengún';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Espander toos';
 $labels['expand-unread'] = 'Espander non lleíos';
 $labels['collapse-all'] = 'Contrayer toos';
 $labels['threaded'] = 'Encadenaos';
-
 $labels['autoexpand_threads'] = 'Espander filos de mensaxes';
 $labels['do_expand'] = 'tolos filos';
 $labels['expand_only_unread'] = 'namái con mensaxes non lleíos';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Llistar columnes';
 $labels['listsorting'] = 'Columna de llistáu';
 $labels['listorder'] = 'Orde de llistáu';
 $labels['listmode'] = 'Mou de vista de llista';
-
 $labels['folderactions'] = 'Aiciones de bandexa...';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
 $labels['importmessages'] = 'Importar mensaxes';
-
 $labels['quota'] = 'Espaciu en discu';
 $labels['unknown']  = 'desconocíu';
 $labels['unlimited']  = 'ensin llímite';
-
 $labels['quicksearch']  = 'Gueta rápida';
 $labels['resetsearch']  = 'Anovar la gueta';
 $labels['searchmod']  = 'Guetar modificadores';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Mensaxe';
 $labels['body']  = 'Cuerpu';
 $labels['type'] = 'Tipu';
 $labels['namex'] = 'Nome';
-
 $labels['openinextwin'] = 'Abrir nuna ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
 $labels['changeformattext'] = 'Amosar en formatu de testu planu';
 $labels['changeformathtml'] = 'Amosar en formatu HTML';
-
-// message compose
 $labels['editasnew']      = 'Editar como nuevu';
 $labels['send']           = 'Unviar';
 $labels['sendmessage']    = 'Unviar el mensaxe yá';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Avisu de recibu';
 $labels['dsn']            = 'Entrega de notificaciones d\'estáu';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
-
 $labels['editidents']    = 'Editar identidaes';
 $labels['spellcheck']    = 'Correutor ortográficu';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Siguir cola edición';
 $labels['revertto']      = 'Revertir a';
-
 $labels['attach'] = 'Axuntar';
 $labels['attachments'] = 'Axuntos';
 $labels['upload'] = 'Xubir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Zarrar';
 $labels['messageoptions']  = 'Opciones de mensaxe...';
-
 $labels['low']     = 'Baxu';
 $labels['lowest']  = 'Mui baxu';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Altu';
 $labels['highest'] = 'Mui altu';
-
 $labels['nosubject']  = '(ensin asuntu)';
 $labels['showimages'] = 'Amosar imáxenes';
 $labels['alwaysshow'] = 'Amosar siempre les imáxenes de $sender';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Esti mensaxe ye un borrador.';
 $labels['andnmore']   = '$nr más...';
 $labels['togglemoreheaders'] = 'Amosar más testeres del mensaxe';
 $labels['togglefullheaders'] = 'Amosar o anubrir testeres de mensaxes';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu';
 $labels['savesentmessagein'] = 'Guardar mensaxe unviáu en';
 $labels['dontsave'] = 'nun guardar';
 $labels['maxuploadsize'] = 'El tamañu másimu pa un ficheru ye $size';
-
 $labels['addcc'] = 'Amestar Cc';
 $labels['addbcc'] = 'Amestar Cct';
 $labels['addreplyto'] = 'Amestar Rempuesta pa';
 $labels['addfollowupto'] = 'Amestar Siguir a';
-
-// mdn
 $labels['mdnrequest'] = 'El qu\'unvia esti mensaxe quier que lu avises cuando lleas el corréu. ¿Quies avisalu?';
 $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 amosóse nel equipu del receutor. Nun hai forma de garantizate que lu lleera o que atalantara\'l conteníu del to mensaxe.';
-
-// address boook
 $labels['name']         = 'Nome completu';
 $labels['firstname']    = 'Nome';
 $labels['surname']      = 'Apellíu';
@@ -305,7 +262,6 @@ $labels['search'] = 'Guetar';
 $labels['advsearch'] = 'Gueta avanzada';
 $labels['advanced'] = 'Avanzaes';
 $labels['other'] = 'Otru';
-
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Trabayu';
 $labels['typeother']  = 'Otru';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'Auxiliar';
 $labels['typehomepage']  = 'Aniciu';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
-
 $labels['addfield'] = 'Amestar campu...';
 $labels['addcontact'] = 'Amestar contautu nuevu';
 $labels['editcontact'] = 'Editar contautu';
 $labels['contacts'] = 'Contautos';
 $labels['contactproperties'] = 'Propiedaes del contautu';
 $labels['personalinfo'] = 'Información personal';
-
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Encaboxar';
 $labels['save']   = 'Guardar';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Renomar';
 $labels['addphoto'] = 'Amestar';
 $labels['replacephoto'] = 'Trocar';
 $labels['uploadphoto'] = 'Xubir xemeya';
-
 $labels['newcontact']     = 'Facer un contautu nuevu';
 $labels['deletecontact']  = 'Desaniciar los contautos marcaos';
 $labels['composeto']      = 'Unviar mensaxe a';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Crear un grupu nuevu de contautos';
 $labels['grouprename']    = 'Renomar grupu';
 $labels['groupdelete']    = 'Desaniciar grupu';
 $labels['groupremoveselected'] = 'Desaniciar los contautos seleicionaos del grupu';
-
 $labels['previouspage']   = 'Amosar páxina previa';
 $labels['firstpage']      = 'Amosar primer páxina';
 $labels['nextpage']       = 'Amosar siguiente páxina';
 $labels['lastpage']       = 'Amosar última páxina';
-
 $labels['group'] = 'Grupu';
 $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Llistar miembros del grupu';
 $labels['personaladrbook'] = 'Direiciones personales';
-
 $labels['searchsave'] = 'Guardar gueta';
 $labels['searchdelete'] = 'Desaniciar gueta';
-
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contautos';
 $labels['importfromfile'] = 'Importar dende un ficheru:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Toos (crear grupos si ye necesario)';
 $labels['importgroupsexisting'] = 'Namái pa los grupos esistentes';
 $labels['importdesc'] = 'Pues xubir contautos dende una llibreta de direiciones esistente.<br/>Anguaño permitimos la importación dende los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separtaos per comes).';
 $labels['done'] = 'Fecho';
-
-// settings
 $labels['settingsfor'] = 'Axustes pa';
 $labels['about'] = 'Tocante a';
 $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'] = 'Identidá nueva';
-
 $labels['newitem'] = 'Nuevu';
 $labels['edititem'] = 'Editar';
-
 $labels['preferhtml'] = 'Amosar HTML';
 $labels['defaultcharset'] = 'Xuegu de caráuteres predetermináu';
 $labels['htmlmessage'] = 'Mensaxe HTML';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Xestionar ventanes emerxentes como ventanes están
 $labels['forwardmode'] = 'Reunviu de mensaxes';
 $labels['inline'] = 'en llinia';
 $labels['asattachment'] = 'como axuntu';
-
 $labels['folder']  = 'Bandexa';
 $labels['folders']  = 'Bandexes';
 $labels['foldername']  = 'Nome de bandexa';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Tipu de bandexa';
 $labels['personalfolder']  = 'Bandexa privada';
 $labels['otherfolder']  = 'Bandexa d\'otru usuariu';
 $labels['sharedfolder']  = 'Bandexa pública';
-
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
-
 $labels['installedplugins'] = 'Complementos instalaos';
 $labels['plugin'] = 'Complementu';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Orixe';
 $labels['license'] = 'Llicencia';
 $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'] = 'Européu occidental';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamín';
 $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreanu';
 $labels['chinese'] = 'Chinu';
-
 ?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 69d5ecc2f..35a850e57 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = '¡Hebo un fallu!';
 $messages['loginfailed']  = 'Contraseña o nome d\'usuariu incorreutu.';
 $messages['cookiesdisabled'] = 'El to navegador nun aceuta "cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Nun s\'atopa\'l contautu solicitáu.';
 $messages['contactsearchonly'] = 'Introduz dalgún criteriu pa guetar contautos';
 $messages['sendingfailed'] = 'Falló l\'unviu del mensaxe';
 $messages['senttooquickly'] = 'Por favor espera $sec segundu/os enantes d\'unviar esti mensaxe.';
-$messages['errorsavingsent'] = 'Hebo un fallu al guardar el mensaxe unviáu.';
-$messages['errorsaving'] = 'Falló al guardase.';
 $messages['errormoving'] = 'Nun pudo movese el/los mensaxe(s).';
 $messages['errorcopying'] = 'Nun pudo copiase el/los mensaxe(s).';
 $messages['errordeleting'] = 'Nun pudo desaniciase el/los mensaxe(s)';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Fallu SMTP: $msg';
 $messages['emailformaterror'] = 'Direición de corréu incorreuta: $email';
 $messages['toomanyrecipients'] = 'Hai munchos destinatarios. Amenorga\'l númberu de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El númberu de miembros del grupu perpasa\'l máximu de $max.';
-$messages['internalerror'] = 'Hebo un fallu internu. Por favor, inténtalo de nueves.';
 $messages['contactdelerror'] = 'Nun pudo desaniciase el/los contautu(os).';
 $messages['contactdeleted'] = 'Contautu(os) desaniciáu(os) correchamente.';
 $messages['contactrestoreerror'] = 'Nun pudieron restaurase los contautos desaniciaos.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Nun puede crease/movese la carpeta a la carpet
 $messages['messagetoobig'] = 'Esta parte del mensaxe ye enforma grande pa procesala';
 $messages['attachmentvalidationerror'] = '¡ATENCIÓN! Esti axuntu ye sospechosu porque\'l so tipu nun concasa col tipu declaráu nel mensaxe. Si nun confíes nel so remitente, nun tendríes d\'abrilu nel to navegador porque podría tener conteníu maliciosu.<br/<br/> <em>Esperábase: $expected; atopóse: $detected</em>';
 $messages['noscriptwarning'] = 'Avisu: ¡esti serviciu de webmail necesita Javascript! Pa poder usalu, habilita\'l soporte de Javascript nel to navegador, por favor.';
-
 ?>
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 129315ec0..60930a49d 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// 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['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Xüsusi qovluqlar üçün real adları göstər';
 $labels['subject'] = 'Mövzu';
 $labels['from']    = 'Kimdən';
 $labels['sender']  = 'Göndərən';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Vaciblik';
 $labels['organization'] = 'Təşkilat';
 $labels['readstatus'] = 'Statusu oxu';
 $labels['listoptions'] = 'Siyahı ayarları...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Endir';
 $labels['open']     = 'Aç';
 $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'] = 'Ç';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Ça';
 $labels['thu'] = 'C';
 $labels['fri'] = 'Ca';
 $labels['sat'] = 'Ş';
-
-// weekdays long
 $labels['sunday']    = 'Bazar';
 $labels['monday']    = 'Bazar ertəsi';
 $labels['tuesday']   = 'Çərçənbə';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Çərşənbə axşamı';
 $labels['thursday']  = 'Cümə';
 $labels['friday']    = 'Cümə axşamı';
 $labels['saturday']  = 'Şənbə';
-
-// months short
 $labels['jan']	= 'Yan';
 $labels['feb']	= 'Fev';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sen';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Noy';
 $labels['dec']	= 'Dek';
-
-// months long
 $labels['longjan']	= 'Yanvar';
 $labels['longfeb']	= 'Fevral';
 $labels['longmar']	= 'Mart';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Sentyabr';
 $labels['longoct']	= 'Oktyabr';
 $labels['longnov']	= 'Noyabr';
 $labels['longdec']	= 'Dekabr';
-
 $labels['today'] = 'Bu gün';
-
-// toolbar buttons
 $labels['refresh']          = 'Yenilə';
 $labels['checkmail']        = 'Gələnləri yoxla';
 $labels['compose']          = 'Məktub yaz';
@@ -155,7 +130,6 @@ $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';
@@ -163,7 +137,7 @@ $labels['currpage'] = 'Hazırki səhifəni';
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
 $labels['unanswered'] = 'Cavabsızları';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'Qoşma ilə';
 $labels['deleted'] = 'Silinmişləri';
 $labels['undeleted'] = 'Silinməyib';
 $labels['invert'] = 'İnvertliləri';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Mesajların idxalı';
 $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['body']  = 'Mətn';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Növ';
+$labels['namex'] = 'Ad';
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
 $labels['changeformattext'] = 'Sadə mətn formatında göstər';
 $labels['changeformathtml'] = 'HTML formatında göstər';
-
-// message compose
 $labels['editasnew']      = 'Yeni kimi redaktə et';
 $labels['send']           = 'Göndər';
 $labels['sendmessage']    = 'İndi göndər';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Orfoqrafiyanı yoxla';
 $labels['resumeediting'] = 'Redaktəni davam 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['highest'] = 'Çox yüksək';
-
 $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';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Göstərilən ad';
 $labels['firstname']    = 'Adı';
 $labels['surname']      = 'Soyadı';
@@ -304,7 +262,6 @@ $labels['search'] = 'Axtar';
 $labels['advsearch'] = 'Ətraflı axtarış';
 $labels['advanced'] = 'Əlavə';
 $labels['other'] = 'Başqa';
-
 $labels['typehome']   = 'Ev';
 $labels['typework']   = 'İş';
 $labels['typeother']  = 'Başqa';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Ləğv et';
 $labels['save']   = 'Saxla';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
 $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['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Qrup üzvlərinin siyahısı';
 $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:';
-$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';
@@ -406,7 +350,7 @@ $labels['htmleditor'] = 'HTML-də mesaj yaz';
 $labels['htmlonreply'] = 'yalnız HTML mesajlar ilə cavab';
 $labels['htmlonreplyandforward'] = 'HTML məktuba cavab və yönəltmə zamanı';
 $labels['htmlsignature'] = 'HTML imza';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'E-poçt ünvanları displey adları ilə göstər';
 $labels['previewpane'] = 'Prevyu paneli göstər';
 $labels['skin'] = 'İnterfeys stili';
 $labels['logoutclear'] = 'Poçtdan çıxan zaman səbəti təmizlə';
@@ -476,11 +420,10 @@ $labels['spellcheckignorenums'] = 'Rəqəmlər ilə sözləri keç';
 $labels['spellcheckignorecaps'] = 'Böyük hərfləri olan sözlərdən keç';
 $labels['addtodict'] = 'Lüğətə əlavə et';
 $labels['mailtoprotohandler'] = 'mailto: keçid üçün protokol qeyd et';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Handle popapsı standart pəncərələr kimi';
 $labels['forwardmode'] = 'Məktubların yönəldilməsi';
 $labels['inline'] = 'mətndə';
 $labels['asattachment'] = 'fayl kimi';
-
 $labels['folder']  = 'Qovluq';
 $labels['folders']  = 'Qovluqlar';
 $labels['foldername']  = 'Qovluq adı';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Qovluq növü';
 $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['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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Vyetnamca';
 $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 745836e5f..ddab8d702 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Xəta baş verdi!';
 $messages['loginfailed']  = 'Giriş uğursuz oldu.';
 $messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Tələb olunan ünvan tapılmadı';
 $messages['contactsearchonly'] = 'Kontaqların axtarışı üçün şərti daxil edin';
 $messages['sendingfailed'] = 'Məktub göndərilmədi';
 $messages['senttooquickly'] = 'Məktub göndərmək üçün $sec saniyə gözləmək gərəkir';
-$messages['errorsavingsent'] = 'Göndərilən məktub saxlanılan zaman xəta baş verdi';
-$messages['errorsaving'] = 'Saxlanma prosesi zamanı problem baş verdi';
 $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ı';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Səhv ünvan: $email';
 $messages['toomanyrecipients'] = 'Qəbul edənlər həddindən artıq çoxdur. Lütfən, $max qədər azaldın.';
 $messages['maxgroupmembersreached'] = 'Qrupun ölçüsü imkan verilən maksimumdan artıqdır - $max';
-$messages['internalerror'] = 'Daxili xəta baş verdi. Lütfən, bir daha cəhd edin';
 $messages['contactdelerror'] = 'Kontak(lar)ı silmək alınmadı';
 $messages['contactdeleted'] = 'Kontak(lar) uğurla silindi';
 $messages['contactrestoreerror'] = 'Silinmiş kontakt(lar)ın bərpası alınmadı';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Qovluğu seçilmiş ana qovluğa köçürmək/
 $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 b3518f8f0..b5a3ed6d8 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Вітаем у $product';
 $labels['username']  = 'Карыстальнік';
 $labels['password']  = 'Пароль';
 $labels['server']    = 'Сервер';
 $labels['login']     = 'Уваход';
-
-// taskbar
 $labels['logout']   = 'Выхад';
 $labels['mail']     = 'Пошта';
 $labels['settings'] = 'Настаўленні';
 $labels['addressbook'] = 'Адрасная кніга';
-
-// mailbox names
 $labels['inbox']  = 'Атрыманыя';
 $labels['drafts'] = 'Чарнавікі';
 $labels['sent']   = 'Дасланыя';
 $labels['trash']  = 'Сметніца';
 $labels['junk']   = 'Спам';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Паказваць сапраўдныя імёны для адмысловых папак';
 $labels['subject'] = 'Тэма';
 $labels['from']    = 'Ад каго';
 $labels['sender']  = 'Адпраўнік';
@@ -53,37 +43,29 @@ $labels['size']    = 'Памер';
 $labels['priority'] = 'Прыярытэт';
 $labels['organization'] = 'Установа';
 $labels['readstatus'] = 'Не прачытанае';
-$labels['listoptions'] = 'List options...';
-
+$labels['listoptions'] = 'Параметры спісу...';
 $labels['mailboxlist'] = 'Тэчкі';
-$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['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['download'] = 'Спампаваць';
-$labels['open']     = 'Open';
+$labels['open']     = 'Адчыніць';
 $labels['showattachment'] = 'Паказаць';
-$labels['showanyway'] = 'Show it anyway';
-
+$labels['showanyway'] = 'Усё адно паказваць';
 $labels['filename'] = 'Імя файла';
 $labels['filesize'] = 'Памер файла';
-
 $labels['addtoaddressbook'] = 'Дадаць у адрасную кнігу';
-
-// weekdays short
-$labels['sun'] = 'Ндз';
-$labels['mon'] = 'Пн';
-$labels['tue'] = 'Аўт';
-$labels['wed'] = 'Сер';
-$labels['thu'] = 'Чц';
-$labels['fri'] = 'Пт';
-$labels['sat'] = 'Сб';
-
-// weekdays long
+$labels['sun'] = 'нд';
+$labels['mon'] = 'пн';
+$labels['tue'] = 'аў';
+$labels['wed'] = 'ср';
+$labels['thu'] = 'чц';
+$labels['fri'] = 'пт';
+$labels['sat'] = 'сб';
 $labels['sunday']    = 'нядзеля';
 $labels['monday']    = 'панядзелак';
 $labels['tuesday']   = 'аўторак';
@@ -91,457 +73,411 @@ $labels['wednesday'] = 'серада';
 $labels['thursday']  = 'чацвер';
 $labels['friday']    = 'пятніца';
 $labels['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['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
-$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['type'] = 'Type';
-$labels['namex'] = 'Name';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['jan']	= 'сту';
+$labels['feb']	= 'лют';
+$labels['mar']	= 'сак';
+$labels['apr']	= 'кра';
+$labels['may']	= 'май';
+$labels['jun']	= 'чэр';
+$labels['jul'] 	= 'ліп';
+$labels['aug']	= 'жні';
+$labels['sep']	= 'вер';
+$labels['oct']	= 'кас';
+$labels['nov']	= 'ліс';
+$labels['dec']	= 'сне';
+$labels['longjan']	= 'студзень';
+$labels['longfeb']	= 'люты';
+$labels['longmar']	= 'сакавік';
+$labels['longapr']	= 'красавік';
+$labels['longmay']	= 'май';
+$labels['longjun']	= 'чэрвень';
+$labels['longjul']	= 'ліпень';
+$labels['longaug']	= 'жнівень';
+$labels['longsep']	= 'верасень';
+$labels['longoct']	= 'кастрычнік';
+$labels['longnov']	= 'лістапад';
+$labels['longdec']	= 'снежань';
+$labels['today'] = 'сёння';
+$labels['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['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['select'] = 'Выбраць';
+$labels['all'] = 'Усе';
+$labels['none'] = 'Жаднага';
+$labels['currpage'] = 'Бягучая старонка';
+$labels['unread'] = 'Непрачытаныя';
+$labels['flagged'] = 'З флагам';
+$labels['unanswered'] = 'Неадказаныя';
+$labels['withattachment'] = 'З далучэннямі';
+$labels['deleted'] = 'Выдаленыя';
+$labels['undeleted'] = 'Нявыдаленыя';
+$labels['invert'] = 'Інвертаваць';
+$labels['filter'] = 'Фільтр';
+$labels['list'] = 'Спіс';
+$labels['threads'] = 'Абмеркаванні';
+$labels['expand-all'] = 'Развінуць усё';
+$labels['expand-unread'] = 'Развінуць непрачытаныя';
+$labels['collapse-all'] = 'Звінуць усё';
+$labels['threaded'] = 'Абмеркаванні';
+$labels['autoexpand_threads'] = 'Развінуць абмеркаванні';
+$labels['do_expand'] = 'усе абмеркаванні';
+$labels['expand_only_unread'] = 'толькі з непрачытанымі паведамленнямі';
+$labels['fromto'] = 'Ад/Да';
+$labels['flag'] = 'Флаг';
+$labels['attachment'] = 'Далучэнне';
+$labels['nonesort'] = 'Адсутнічае';
+$labels['sentdate'] = 'Дата адпраўкі';
+$labels['arrival'] = 'Дата атрымання';
+$labels['asc'] = 'на ўзрастанне';
+$labels['desc'] = 'на змяншчэнне';
+$labels['listcolumns'] = 'Слупкі';
+$labels['listsorting'] = 'Сартаваць паводле';
+$labels['listorder'] = 'Парадак сартавання';
+$labels['listmode'] = 'Тып спісу';
+$labels['folderactions'] = 'Аперацыі з папкай...';
+$labels['compact'] = 'Сціснуць';
+$labels['empty'] = 'Спаражніць';
+$labels['importmessages'] = 'Імпартаваць паведамленні';
+$labels['quota'] = 'Квота';
+$labels['unknown']  = 'невядома';
+$labels['unlimited']  = 'без абмежаванняў';
+$labels['quicksearch']  = 'Хуткі пошук';
+$labels['resetsearch']  = 'Скінуць пошук';
+$labels['searchmod']  = 'Мадыфікатары пошуку';
+$labels['msgtext']  = 'Усё паведамленне';
+$labels['body']  = 'Цела';
+$labels['type'] = 'Тып';
+$labels['namex'] = 'Імя';
+$labels['openinextwin'] = 'Адчыніць у новым акне';
+$labels['emlsave'] = 'Спампаваць (.eml)';
+$labels['changeformattext'] = 'Паказаць як просты тэкст';
+$labels['changeformathtml'] = 'Паказаць як HTML';
+$labels['editasnew']      = 'Адрэдагаваць як новае';
+$labels['send']           = 'Адправіць';
+$labels['sendmessage']    = 'Адправіць паведамленне';
+$labels['savemessage']    = 'Захаваць як чарнавік';
+$labels['addattachment']  = 'Далучыць файл';
+$labels['charset']        = 'Кадзіроўка';
+$labels['editortype']     = 'Рэдактар';
+$labels['returnreceipt']  = 'Пацверджанне атрымання';
+$labels['dsn']            = 'Апавяшчэнне пра дастаўку';
+$labels['mailreplyintro'] = '$sender пісаў $date:';
+$labels['originalmessage'] = 'Арыгінальнае паведамленне';
+$labels['editidents']    = 'Рэдагаваць тоеснасці';
+$labels['spellcheck']    = 'Правапіс';
+$labels['checkspelling'] = 'Праверыць правапіс';
+$labels['resumeediting'] = 'Працягнуць рэдагаванне';
+$labels['revertto']      = 'Адкаціцца на';
+$labels['attach'] = 'Далучыць';
+$labels['attachments'] = 'Далучэнні';
+$labels['upload'] = 'Запампаваць';
+$labels['uploadprogress'] = '$percent ($current з $total)';
+$labels['close']  = 'Зачыніць';
+$labels['messageoptions']  = 'Параметры паведамлення...';
+$labels['low']     = 'Нізкі';
+$labels['lowest']  = 'Найнізшы';
+$labels['normal']  = 'Звычайны';
+$labels['high']    = 'Высокі';
+$labels['highest'] = 'Найвышшы';
+$labels['nosubject']  = '(без тэмы)';
+$labels['showimages'] = 'Паказваць відарысы';
+$labels['alwaysshow'] = 'Заўсёды паказваць відарысы ад $sender';
+$labels['isdraft']    = 'Гэта чарнавік.';
+$labels['andnmore']   = 'яшчэ $nr...';
+$labels['togglemoreheaders'] = 'Паказаць больш загалоўкаў паведамлення';
+$labels['togglefullheaders'] = 'Паказаць неапрацаваныя загалоўкі паведамлення';
 $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['plaintoggle'] = 'Звычайны тэкст';
+$labels['savesentmessagein'] = 'Захаваць паведамленне ў';
+$labels['dontsave'] = 'не захоўваць';
+$labels['maxuploadsize'] = 'Максімальна дазволены памер файла — $size';
+$labels['addcc'] = 'Копія';
+$labels['addbcc'] = 'Схаваная копія';
+$labels['addreplyto'] = 'Адказаць-на';
+$labels['addfollowupto'] = 'Групавы-адказ-на';
+$labels['mdnrequest'] = 'Адпраўнік пажадаў даведацца аб прачытанні гэтага паведамлення. Апавясціць адпраўніка?';
+$labels['receiptread'] = 'Пацверджанне атрымання (прачытання)';
+$labels['yourmessage'] = 'Гэта пацверджанне аб атрыманні вашага паведамлення';
+$labels['receiptnote'] = 'Заўвага: Гэтае пацверджанне значыць адно, што паведамленне было адлюстравана на экране кампутара адрасата. Няма гарантыі, што атрымальнік прачытаў альбо зразумеў змест паведамлення.';
+$labels['name']         = 'Экраннае імя';
+$labels['firstname']    = 'Імя';
+$labels['surname']      = 'Прозвішча';
+$labels['middlename']   = 'Другое імя';
+$labels['nameprefix']   = 'Прэфікс';
+$labels['namesuffix']   = 'Суфікс';
+$labels['nickname']     = 'Мянушка';
+$labels['jobtitle']     = 'Пасада';
+$labels['department']   = 'Аддзел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Дзявоцкае прозвішча';
+$labels['email']        = 'Эл. пошта';
+$labels['phone']        = 'Тэлефон';
+$labels['address']      = 'Адрас';
+$labels['street']       = 'Вуліца';
+$labels['locality']     = 'Горад';
+$labels['zipcode']      = 'Індэкс';
+$labels['region']       = 'Рэгіён';
+$labels['country']      = 'Краіна';
+$labels['birthday']     = 'Дзень народзінаў';
+$labels['anniversary']  = 'Юбілей';
+$labels['website']      = 'Вэб-сайт';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = '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['listgroup'] = 'List group members';
-$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 contacts to';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
-$labels['importgroupsexisting'] = 'Only for existing groups';
-$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['showemail'] = 'Show email address with display name';
-$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['notes'] = 'Зацемкі';
+$labels['male']   = 'мужчына';
+$labels['female'] = 'жанчына';
+$labels['manager'] = 'Кіраўнік';
+$labels['assistant'] = 'Асістэнт';
+$labels['spouse'] = 'Жонка';
+$labels['allfields'] = 'Усе палі';
+$labels['search'] = 'Пошук';
+$labels['advsearch'] = 'Пашыраны пошук';
+$labels['advanced'] = 'Дадаткова';
+$labels['other'] = 'Іншае';
+$labels['typehome']   = 'Дом';
+$labels['typework']   = 'Праца';
+$labels['typeother']  = 'Іншае';
+$labels['typemobile']  = 'Мабільны';
+$labels['typemain']  = 'Асноўны';
+$labels['typehomefax']  = 'Дамашні факс';
+$labels['typeworkfax']  = 'Працоўны факс';
+$labels['typecar']  = 'Аўта';
+$labels['typepager']  = 'Пэйджар';
+$labels['typevideo']  = 'Відэа';
+$labels['typeassistant']  = 'Асістэнт';
+$labels['typehomepage']  = 'Дамашняя старонка';
+$labels['typeblog'] = 'Блог';
+$labels['typeprofile'] = 'Профіль';
+$labels['addfield'] = 'Дадаць поле...';
+$labels['addcontact'] = 'Дадаць новы кантакт';
+$labels['editcontact'] = 'Рэдагаваць кантакт';
+$labels['contacts'] = 'Кантакты';
+$labels['contactproperties'] = 'Уласцівасці кантакта';
+$labels['personalinfo'] = 'Асабістыя звесткі';
+$labels['edit']   = 'Рэдагаваць';
+$labels['cancel'] = 'Скасаваць';
+$labels['save']   = 'Захаваць';
+$labels['delete'] = 'Выдаліць';
+$labels['rename'] = 'Перайменаваць';
+$labels['addphoto'] = 'Дадаць';
+$labels['replacephoto'] = 'Замяніць';
+$labels['uploadphoto'] = 'Запампаваць фота';
+$labels['newcontact']     = 'Стварыць новую картку кантакта';
+$labels['deletecontact']  = 'Выдаліць абраных кантактаў';
+$labels['composeto']      = 'Скласці ліст да';
+$labels['contactsfromto'] = 'Кантакты $from—$to з $count';
+$labels['print']          = 'Друкаваць';
+$labels['export']         = 'Экспарт';
+$labels['exportall']      = 'Экспартаваць усё';
+$labels['exportsel']      = 'Экспартаваць абранае';
+$labels['exportvcards']   = 'Экспартаваць кантакты ў фармаце vCard';
+$labels['newcontactgroup'] = 'Стварыць новую групу кантактаў';
+$labels['grouprename']    = 'Перайменаваць групу';
+$labels['groupdelete']    = 'Выдаліць групу';
+$labels['groupremoveselected'] = 'Выдаліць абраных кантакаў з групы';
+$labels['previouspage']   = 'Папярэдняя старонка';
+$labels['firstpage']      = 'Першая старонка';
+$labels['nextpage']       = 'Наступная старонка';
+$labels['lastpage']       = 'Апошняя старонка';
+$labels['group'] = 'Група';
+$labels['groups'] = 'Групы';
+$labels['listgroup'] = 'Паказаць сяброў групы';
+$labels['personaladrbook'] = 'Асабістыя адрасы';
+$labels['searchsave'] = 'Захаваць запытанне';
+$labels['searchdelete'] = 'Выдаліць запытанне';
+$labels['import'] = 'Імпарт';
+$labels['importcontacts'] = 'Імпартаваць кантакты';
+$labels['importfromfile'] = 'Імпартаваць з файла:';
+$labels['importtarget'] = 'Дадаць канактаў у';
+$labels['importreplace'] = 'Замяніць адрасную кнігу цалкам';
+$labels['importgroups'] = 'Імпартаваць прызначэнні групы';
+$labels['importgroupsall'] = 'Усе (стварыць групы пры неабходнасці)';
+$labels['importgroupsexisting'] = 'Толькі для існуючых груп';
+$labels['importdesc'] = 'Кантакты можна запампаваць з існуючай адраснай кнігі.<br/>На дадзены момант падтрымліваюцца адрасы ў фарматах <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  і CSV (значэнні цераз коску).';
+$labels['done'] = 'Гатова';
+$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['signature'] = 'Подпіс';
+$labels['dstactive']  = 'Летні/зімовы час';
+$labels['showinextwin'] = 'Адчыняць паведамленне ў новым акне';
+$labels['composeextwin'] = 'Складаць у новым акне';
+$labels['htmleditor'] = 'Складаць паведамленні ў HTML';
+$labels['htmlonreply'] = 'у адказ на паведамленні ў HTML';
+$labels['htmlonreplyandforward'] = 'пры перасылцы альбо ў адказ на паведамленні ў HTML';
+$labels['htmlsignature'] = 'Подпіс у HTML';
+$labels['showemail'] = 'Паказваць адрас электроннай пошты разам з экранным імем';
+$labels['previewpane'] = 'Панэль прагляду';
+$labels['skin'] = 'Тэма інтэрфейсу';
+$labels['logoutclear'] = 'Ачышчаць Сметніцу па выхадзе';
+$labels['logoutcompact'] = 'Сціскаць Атрыманыя па выхадзе';
+$labels['uisettings'] = 'Інтэрфейс карыстальніка';
+$labels['serversettings'] = 'Настаўленні сервера';
+$labels['mailboxview'] = 'Выгляд скрынкі';
+$labels['mdnrequests'] = 'Пры запытанні пацверджанняў аб атрыманні';
+$labels['askuser'] = 'спытаць мяне';
+$labels['autosend'] = 'адправіць пацверджанне';
+$labels['autosendknown'] = 'адпраўляць пацверджанне маім кантактам, іначай спытаць';
+$labels['autosendknownignore'] = 'адпраўляць пацверджанне маім кантактам, іначай ігнараваць';
+$labels['ignore'] = 'ігнараваць';
+$labels['readwhendeleted'] = 'Пазначаць паведамленне як прачытанае па выдаленні';
+$labels['flagfordeletion'] = 'Толькі пазначаць паведамленне на выдаленне, не выдаляць';
+$labels['skipdeleted'] = 'Не паказваць выдаленыя паведамленні';
+$labels['deletealways'] = 'Як не ўдалося перамясціць паведамленні ў Сметніцу, выдаліць іх';
+$labels['deletejunk'] = 'Адразу выдаляць паведамленні ў Спаме';
+$labels['showremoteimages'] = 'Паказваць вонкавыя відарысы';
+$labels['fromknownsenders'] = 'ад вядомых адпраўнікоў';
+$labels['always'] = 'заўсёды';
+$labels['showinlineimages'] = 'Паказваць далучаныя відарысы пад паведамленнем';
+$labels['autosavedraft']  = 'Аўтаматычна захоўваць чарнавікі';
+$labels['everynminutes']  = 'кожныя $n мінут(аў)';
+$labels['refreshinterval']  = 'Абнаўленне (праверка новых паведамленняў і г. д.)';
+$labels['never']  = 'ніколі';
+$labels['immediately']  = 'імгненна';
+$labels['messagesdisplaying'] = 'Адлюстраванне  паведамленняў';
+$labels['messagescomposition'] = 'Складанне паведамленняў';
+$labels['mimeparamfolding'] = 'Імёны далучэнняў';
+$labels['2231folding'] = 'Поўны 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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
-$labels['folder']  = 'Folder';
+$labels['2047folding'] = 'Поўны RFC 2047 (інш.)';
+$labels['force7bit'] = 'Ужываць MIME-кадзіроўку для 8-бітных знакаў';
+$labels['advancedoptions'] = 'Дадатковыя параметры';
+$labels['focusonnewmessage'] = 'Актываваць акно браўзера пры новым паведамленні';
+$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'] = 'Адказваючы, выдаліць стары подпіс з паведамлення';
+$labels['autoaddsignature'] = 'Аўтаматычна дадаваць подпіс';
+$labels['newmessageonly'] = 'толькі ў новых паведамленнях';
+$labels['replyandforwardonly'] = 'толькі ў адказах і перасылках';
+$labels['insertsignature'] = 'Уставіць подпіс';
+$labels['previewpanemarkread']  = 'Пазначаць прагледжаныя паведамленні як прачытаныя';
+$labels['afternseconds']  = 'пасля $n секунд';
+$labels['reqmdn'] = 'Заўсёды запытваць пацверджанне аб атрыманні';
+$labels['reqdsn'] = 'Заўсёды запытваць апавяшчэнне аб дастаўцы';
+$labels['replysamefolder'] = 'Складваць адказы ў папку зыходнага паведамлення';
+$labels['defaultabook'] = 'Стандартная адрасная кніга';
+$labels['autocompletesingle'] = 'Прапускаць альтэрнатыўныя адрасы пры аўдадапаўненні';
+$labels['listnamedisplay'] = 'Выводзіць спіс кантактаў як';
+$labels['spellcheckbeforesend'] = 'Правяраць правапіс перад адпраўкай';
+$labels['spellcheckoptions'] = 'Параметры праверкі правапісу';
+$labels['spellcheckignoresyms'] = 'Ігнараваць словы з сімваламі';
+$labels['spellcheckignorenums'] = 'Ігнараваць словы з лікамі';
+$labels['spellcheckignorecaps'] = 'Ігнараваць словы з усімі літарамі ў верхнім рэгістры';
+$labels['addtodict'] = 'Дадаць у слоўнік';
+$labels['mailtoprotohandler'] = 'Зарэгістраваць апрацоўніка для спасылак mailto:';
+$labels['standardwindows'] = 'Успрымаць вокны-бурбалкі як звычайныя вокны';
+$labels['forwardmode'] = 'Перасылка паведамленняў';
+$labels['inline'] = 'у тэксце';
+$labels['asattachment'] = 'як далучэнне';
+$labels['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';
-
+$labels['foldername']  = 'Назва папкі';
+$labels['subscribed']  = 'Падпісаная';
+$labels['messagecount'] = 'Паведамленні';
+$labels['create']  = 'Стварыць';
+$labels['createfolder']  = 'Стварыць новую папку';
+$labels['managefolders']  = 'Парадкаваць папкі';
+$labels['specialfolders'] = 'Адмысловыя папкі';
+$labels['properties'] = 'Уласцівасці';
+$labels['folderproperties'] = 'Уласцівасці папкі';
+$labels['parentfolder'] = 'Бацькоўская папка';
+$labels['location'] = 'Размяшчэнне';
+$labels['info'] = 'Звесткі';
+$labels['getfoldersize'] = 'Пстрыкніце, каб даведацца памер папкі';
+$labels['changesubscription'] = 'Пстрыкніце, каб змяніць падпіску';
+$labels['foldertype'] = 'Тып папкі';
+$labels['personalfolder']  = 'Асабістая папка';
+$labels['otherfolder']  = 'Папка іншага карыстальніка';
+$labels['sharedfolder']  = 'Публічная папка';
+$labels['sortby'] = 'Сартаваць паводле';
+$labels['sortasc']  = 'Сартаваць на ўзрастанне';
+$labels['sortdesc'] = 'Сартаваць на змяншчэнне';
+$labels['undo'] = 'Адмяніць';
+$labels['installedplugins'] = 'Устаноўленыя плагіны';
+$labels['plugin'] = 'Плагін';
+$labels['version'] = 'Версія';
+$labels['source'] = 'Крыніца';
+$labels['license'] = 'Ліцэнзія';
+$labels['support'] = 'Падтрымка';
+$labels['B'] = 'Б';
+$labels['KB'] = 'КБ';
+$labels['MB'] = 'МБ';
+$labels['GB'] = 'ГБ';
+$labels['unicode'] = 'Юнікод';
+$labels['english'] = 'англійская';
+$labels['westerneuropean'] = 'заходне-еўрапейская';
+$labels['easterneuropean'] = 'усходне-еўрапейская';
+$labels['southeasterneuropean'] = 'паўднёва-еўрапейская';
+$labels['baltic'] = 'балтыйская';
+$labels['cyrillic'] = 'кірыліца';
+$labels['arabic'] = 'арабская';
+$labels['greek'] = 'грэцкая';
+$labels['hebrew'] = 'габрэйская';
+$labels['turkish'] = 'турэцкая';
+$labels['nordic'] = 'паўночная';
+$labels['thai'] = 'тайская';
+$labels['celtic'] = 'кельцкая';
+$labels['vietnamese'] = 'в\'етнамская';
+$labels['japanese'] = 'японская';
+$labels['korean'] = 'карэйская';
+$labels['chinese'] = 'кітайская';
 ?>
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index c4033dad9..4b2f07a2f 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -15,162 +15,159 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Збой уваходу.';
-$messages['cookiesdisabled'] = 'Ваш азіральнік не падтрымлівае кукіс.';
-$messages['sessionerror'] = 'Ваша сесія не дзейсная ці састарэла.';
-$messages['storageerror'] = 'Connection to storage server failed.';
+$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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.';
-
+$messages['requesttimedout'] = 'Час запросу выйшаў';
+$messages['errorreadonly'] = 'Не ўдалося выканаць аперацыю. Папка даступна толькі для чытання.';
+$messages['errornoperm'] = 'Не ўдалося выканаць аперацыю. Адмоўлена ў доступе.';
+$messages['erroroverquota'] = 'Не ўдалося выканаць аперацыю. Няма свабоднай прасторы на дыску.';
+$messages['erroroverquotadelete'] = 'Няма свабоднай прасторы на дыску. Націсніце SHIFT+DEL, каб выдаліць паведамленне.';
+$messages['invalidrequest'] = 'Невалідны запрос! Дадзеныя не захаваныя.';
+$messages['invalidhost'] = 'Няслушнае імя сервера.';
+$messages['nomessagesfound'] = 'Паведамленняў у гэтай скрынцы не знойдзена';
+$messages['loggedout'] = 'Сесія скасавана. Да пабачэння!';
+$messages['mailboxempty'] = 'У скрынцы пуста.';
+$messages['refreshing'] = 'Абнаўляецца...';
+$messages['loading'] = 'Загружаецца...';
+$messages['uploading'] = 'Файл запампоўваюцца...';
+$messages['uploadingmany'] = 'Файлы запампоўваюцца...';
+$messages['loadingdata'] = 'Загружаюцца даныя...';
+$messages['checkingmail'] = 'Праверка новых паведамленняў...';
+$messages['sendingmessage'] = 'Паведамленне адпраўляецца...';
+$messages['messagesent'] = 'Паведамленні адпраўлены.';
+$messages['savingmessage'] = 'Паведамленне захоўваецца...';
+$messages['messagesaved'] = 'Паведамленне захавана ў Чарнавікі.';
+$messages['successfullysaved'] = 'Захавана.';
+$messages['addedsuccessfully'] = 'Кантакт дададзены ў адрасную кнігу.';
+$messages['contactexists'] = 'Кантакт з такім самым адрасам эл. пошты ўжо існуе.';
+$messages['contactnameexists'] = 'Кантакт з такім самым імем ужо існуе.';
+$messages['blockedimages'] = 'Дзеля забеспячэння вашай прыватнасці знешнія відарысы ў гэтым паведамленні заблакіраваныя.';
+$messages['encryptedmessage'] = 'Гэта зашыфраванае паведамленне. Яно не можа быць адлюстравана. Выбачайце!';
+$messages['nocontactsfound'] = 'Кантактаў не знойдзена.';
+$messages['contactnotfound'] = 'Запытаны кантакт не знойдзены.';
+$messages['contactsearchonly'] = 'Задайце выраз для пошука кантактаў';
+$messages['sendingfailed'] = 'Не ўдалося адправіць паведамленне.';
+$messages['senttooquickly'] = 'Пачакайце $sec секунд(ы) перад адпраўкай гэтага паведамлення.';
+$messages['errorsavingsent'] = 'Не ўдалося захаваць адпраўленае паведамленне.';
+$messages['errorsaving'] = 'Не ўдалося захаваць.';
+$messages['errormoving'] = 'Не ўдалося перамясціць паведамлення(ў).';
+$messages['errorcopying'] = 'Не ўдалося скапіяваць паведамлення(ў).';
+$messages['errordeleting'] = 'Не ўдалося выдаліць паведамлення(ў).';
+$messages['errormarking'] = 'Не ўдалося пазначыць паведамлення(ў).';
+$messages['deletecontactconfirm']  = 'Напраўду выдаліць абраны(я) кантакты?';
+$messages['deletegroupconfirm']  = 'Напраўду выдаліць абраную групу?';
+$messages['deletemessagesconfirm'] = 'Напраўду выдаліць абранае(ыя) паведамленне?';
+$messages['deletefolderconfirm']  = 'Напраўду выдаліць гэтую папку?';
+$messages['purgefolderconfirm']  = 'Напраўду выдаліць усе паведамленні з гэтай папкі?';
+$messages['contactdeleting'] = 'Кантакт(ы) выдаляюцца...';
+$messages['groupdeleting'] = 'Група выдаляецца...';
+$messages['folderdeleting'] = 'Папка выдаляецца...';
+$messages['foldermoving'] = 'Папка перамяшчаецца...';
+$messages['foldersubscribing'] = 'Папка падпісваецца...';
+$messages['folderunsubscribing'] = 'Папка адпісваецца...';
+$messages['formincomplete'] = 'Фармуляр запоўнены не да канца.';
+$messages['noemailwarning'] = 'Задайце слушны адрас электроннай пошты.';
+$messages['nonamewarning']  = 'Задайце імя.';
+$messages['nopagesizewarning'] = 'Задайце памер старонкі.';
+$messages['nosenderwarning'] = 'Задайце адрас эл. пошты адпраўніка.';
+$messages['norecipientwarning'] = 'Задайце хаця-б аднаго атрымальніка.';
+$messages['nosubjectwarning']  = 'Тэма ліста не зададзена. Ці жадаеце задаць яе зараз?';
+$messages['nobodywarning'] = 'Адправіць гэта паведамленне без тэксту?';
+$messages['notsentwarning'] = 'Паведамленне не адпраўлена. Жадаеце скасаваць сваё паведамленне?';
+$messages['noldapserver'] = 'Задайце ldap-сервер для пошуку.';
+$messages['nosearchname'] = 'Задайце імя кантакта альбо адрас электроннай пошты.';
+$messages['notuploadedwarning'] = 'Не ўсе далучэнні пакуль яшчэ запампаваныя. Пачакайце альбо скасуйце аперацыю.';
+$messages['searchsuccessful'] = 'Знойдзена $nr паведамленняў.';
+$messages['contactsearchsuccessful'] = 'Знойдзена $nr кантактаў.';
+$messages['searchnomatch'] = 'Пошук не даў выніку.';
+$messages['searching'] = 'Ідзе пошук...';
+$messages['checking'] = 'Ідзе праверка...';
+$messages['nospellerrors'] = 'Памылак правапісання не выяўлена.';
+$messages['folderdeleted'] = 'Папка выдалена.';
+$messages['foldersubscribed'] = 'Папка падпісана.';
+$messages['folderunsubscribed'] = 'Папка адпісана.';
+$messages['folderpurged'] = 'Папка ачышчана.';
+$messages['folderexpunged'] = 'Папка сціснута. ';
+$messages['deletedsuccessfully'] = 'Выдалена.';
+$messages['converting'] = 'Фарматаванне выдаляецца...';
+$messages['messageopenerror'] = 'Не ўдалося загрузіць паведамленне з сервера.';
+$messages['fileuploaderror'] = 'Не ўдалося запампаваць файл.';
+$messages['filesizeerror'] = 'Запампаваны файл перавышае максімальна дазволены памер $size.';
+$messages['copysuccess'] = '$nr кантактаў скапіявана.';
+$messages['movesuccess'] = '$nr кантактаў перамешчана.';
+$messages['copyerror'] = 'Не ўдалося скапіяваць ніводнага кантакта.';
+$messages['moveerror'] = 'Не ўдалося перамясціць ніводнага кантакта.';
+$messages['sourceisreadonly'] = 'Гэтая крыніца адрасоў толькі для чытання.';
+$messages['errorsavingcontact'] = 'Не ўдалося захаваць адрас кантакта.';
+$messages['movingmessage'] = 'Паведамленні(е) перамяшчаюцца...';
+$messages['copyingmessage'] = 'Паведамленні(е) капіююцца...';
+$messages['copyingcontact'] = 'Кантакт(ы) капіююцца...';
+$messages['movingcontact'] = 'Кантакт(ы) перамяшчаюцца...';
+$messages['deletingmessage'] = 'Паведамленні(е) выдаляюцца...';
+$messages['markingmessage'] = 'Паведамленні(е) пазначаюцца...';
+$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['importformaterror'] = 'Імпартаванне не ўдалося! Запампаваны файл не ўтрымоўвае слушных даных на імпарт.';
+$messages['importconfirm'] = '<b>$inserted кантактаў імпартаваныя</b>';
+$messages['importconfirmskipped'] = '<b>Прапушчана $skipped існуючых запісаў</b>';
+$messages['importmessagesuccess'] = '$nr паведамленняў імпартавана';
+$messages['importmessageerror'] = 'Не ўдалося імпартаваць! Запампаваны файл не ёсць слушным паведамленнем альбо файлам паштовай скрынкі';
+$messages['opnotpermitted'] = 'Аперацыя не дазволеная!';
+$messages['nofromaddress'] = 'У абранай тоеснасці не стае адрасу эл. пошты.';
+$messages['editorwarning'] = 'Змена рэдактара прывядзе да страты фарматавання. Працягнуць?';
+$messages['httpreceivedencrypterror'] = 'Важная памылка ў канфігурацыі. Неадкладна скантактуйцеся з адміністратарам. <b>Паведамленне не можа быць адпраўлена.</b>';
+$messages['smtpconnerror'] = 'Памылка SMTP ($code): Не ўдалося злучыцца з серверам.';
+$messages['smtpautherror'] = 'Памылка SMTP ($code): Аўтэтыфікацыя не ўдалася.';
+$messages['smtpfromerror'] = 'Памылка SMTP ($code): Не ўдалося задаць адпраўніка "$from" ($msg).';
+$messages['smtptoerror'] = 'Памылка STMP ($code): Не ўдалося задаць атрымальніка "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Памылка STMP: Не ўдалося прачытаць спіс атрымальнікаў.';
+$messages['smtperror'] = 'Памылка SMTP: $msg';
+$messages['emailformaterror'] = 'Няслушны адрас эл. пошты: $email';
+$messages['toomanyrecipients'] = 'Замнога атрымальнікаў. Зменшыце лік атрымальнікаў да $max.';
+$messages['maxgroupmembersreached'] = 'Лік сяброў групы перавышае максімум — $max.';
+$messages['internalerror'] = 'Унутраная памылка. Паспрабуйце яшчэ раз.';
+$messages['contactdelerror'] = 'Не ўдалося выдаліць кантакта(ў).';
+$messages['contactdeleted'] = 'Кантакт(ы) выдалены.';
+$messages['contactrestoreerror'] = 'Не ўдалося аднавіць выдаленыя кантакт(ы).';
+$messages['contactrestored'] = 'Кантакт(ы) адноўлены.';
+$messages['groupdeleted'] = 'Група выдалена.';
+$messages['grouprenamed'] = 'Група перайменавана.';
+$messages['groupcreated'] = 'Група створана.';
+$messages['savedsearchdeleted'] = 'Захаванае запытанне выдалена.';
+$messages['savedsearchdeleteerror'] = 'Не ўдалося выдаліць захаванае запытанне.';
+$messages['savedsearchcreated'] = 'Захаванае запытанне створана.';
+$messages['savedsearchcreateerror'] = 'Не ўдалося стварыць захаванае запытанне.';
+$messages['messagedeleted'] = 'Паведамленні(е) выдалены.';
+$messages['messagemoved'] = 'Паведамленні(е) перамешчаны.';
+$messages['messagecopied'] = 'Паведамленні(е) скапіяваны.';
+$messages['messagemarked'] = 'Паведамленні(е) пазначаны.';
+$messages['autocompletechars'] = 'Увядзіце мінімум $min знакаў для аўтадапаўнення.';
+$messages['autocompletemore'] = 'Больш адпаведных запісаў знойдзена. Увядзіце больш знакаў.';
+$messages['namecannotbeempty'] = 'Назва не можа быць пустой.';
+$messages['nametoolong'] = 'Назва задаўгая.';
+$messages['folderupdated'] = 'Папка абноўлена.';
+$messages['foldercreated'] = 'Папка створана.';
+$messages['invalidimageformat'] = 'Няслушны фармат відарысу.';
+$messages['mispellingsfound'] = 'У паведамленні выяўлены правапісныя памылкі.';
+$messages['parentnotwritable'] = 'Не ўдалося стварыць/перамясціць папку ў абраным месцы. Няма доступу.';
+$messages['messagetoobig'] = 'Гэтая часць паведамлення завялікая, каб яе апрацаваць.';
+$messages['attachmentvalidationerror'] = 'УВАГА! Гэтае далучэнне ёсць падазроным, бо тып ягоны не супадае з заяўленым тыпам у паведамленні. Калі вы не давяраеце гэтаму адпраўніку, не адчыняйце яго ў браўзеры, таму што яно можа ўтрымліваць шкоднае змесціва.<br/><br/><em>Чаканы: $expected; знойдзены: $detected<em>';
+$messages['noscriptwarning'] = 'Увага: Служба вымагае Javascript’у! Каб карыстацца ёй, трэба ўключыць Javascript у настаўленнях браўзера.';
 ?>
diff --git a/program/localization/ber/labels.inc b/program/localization/ber/labels.inc
index 1128b0d4b..939405707 100644
--- a/program/localization/ber/labels.inc
+++ b/program/localization/ber/labels.inc
@@ -13,6 +13,5 @@
  +-----------------------------------------------------------------------+
 */
 
-$labels = array();
 $labels['username'] = 'Izwel n';
 
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 3c63580b6..29c99e8f4 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Добре дошли в $product';
 $labels['username']  = 'Потребител';
 $labels['password']  = 'Парола';
 $labels['server']    = 'Сървър';
 $labels['login']     = 'Вход';
-
-// taskbar
 $labels['logout']   = 'Изход';
 $labels['mail']     = 'Поща';
 $labels['settings'] = 'Настройки';
 $labels['addressbook'] = 'Адресна книга';
-
-// mailbox names
 $labels['inbox']  = 'Вх. поща';
 $labels['drafts'] = 'Чернови';
 $labels['sent']   = 'Изпратени';
 $labels['trash']  = 'Кошче';
 $labels['junk']   = 'Спам';
 $labels['show_real_foldernames'] = 'Показва истинските имена на служебните папки';
-
-// message listing
 $labels['subject'] = 'Заглавие';
 $labels['from']    = 'От';
 $labels['sender']  = 'Подател';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статут (прочетено/ново)';
 $labels['listoptions'] = 'Настройки на списък...';
-
 $labels['mailboxlist'] = 'Папки';
 $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']   = 'Премести във...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Изтегли';
 $labels['open']     = 'Отвори';
 $labels['showattachment'] = 'Показване';
 $labels['showanyway'] = 'Показване въпреки това';
-
 $labels['filename'] = 'Име на файла';
 $labels['filesize'] = 'Размер на файла';
-
 $labels['addtoaddressbook'] = 'Добави в адресната книга';
-
-// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Сря';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Съб';
-
-// weekdays long
 $labels['sunday']    = 'Неделя';
 $labels['monday']    = 'Понеделник';
 $labels['tuesday']   = 'Вторник';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Сряда';
 $labels['thursday']  = 'Четвъртък';
 $labels['friday']    = 'Петък';
 $labels['saturday']  = 'Събота';
-
-// months short
 $labels['jan']	= 'Яну';
 $labels['feb']	= 'Фев';
 $labels['mar']	= 'Мар';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Сеп';
 $labels['oct']	= 'Окт';
 $labels['nov']	= 'Ное';
 $labels['dec']	= 'Дек';
-
-// months long
 $labels['longjan']	= 'Януари';
 $labels['longfeb']	= 'Февруари';
 $labels['longmar']	= 'Март';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Септември';
 $labels['longoct']	= 'Октомври';
 $labels['longnov']	= 'Ноември';
 $labels['longdec']	= 'Декември';
-
 $labels['today'] = 'Днес';
-
-// toolbar buttons
 $labels['refresh']          = 'Обнови';
 $labels['checkmail']        = 'Провери за нова поща';
 $labels['compose']          = 'Напиши';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Допълнителни действия...';
 $labels['more']             = 'Още';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Опции';
-
 $labels['select'] = 'Избери';
 $labels['all'] = 'Всички';
 $labels['none'] = 'Остави без избор';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Разгъни всички';
 $labels['expand-unread'] = 'Разгъни непрочетените';
 $labels['collapse-all'] = 'Сгъни всички';
 $labels['threaded'] = 'Групирани по кореспонденции';
-
 $labels['autoexpand_threads'] = 'Разгъни кореспонденции';
 $labels['do_expand'] = 'всички кореспонденции';
 $labels['expand_only_unread'] = 'само с непрочетени писма';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Колони на списък';
 $labels['listsorting'] = 'Подреди по колона';
 $labels['listorder'] = 'Посока на подреждане';
 $labels['listmode'] = 'Изглед на списък';
-
 $labels['folderactions'] = 'Действия за папки...';
 $labels['compact'] = 'Уплътни данни';
 $labels['empty'] = 'Изпразни';
 $labels['importmessages'] = 'Импорт на писма';
-
 $labels['quota'] = 'Използвано място';
 $labels['unknown']  = 'няма информация';
 $labels['unlimited']  = 'без ограничение';
-
 $labels['quicksearch']  = 'Бързо търсене';
 $labels['resetsearch']  = 'Изчисти филтър и покажи всичко';
 $labels['searchmod']  = 'Филтър по';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Цялото писмо';
 $labels['body']  = 'Основен текст';
 $labels['type'] = 'Тип';
 $labels['namex'] = 'Име';
-
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
 $labels['changeformattext'] = 'Покажи в текстов формат';
 $labels['changeformathtml'] = 'Покажи в HTML формат';
-
-// message compose
 $labels['editasnew']      = 'Редактирай като ново';
 $labels['send']           = 'Изпрати';
 $labels['sendmessage']    = 'Изпрати писмото';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Обратна разписка';
 $labels['dsn']            = 'Нотификация при доставка';
 $labels['mailreplyintro'] = 'На $date, $sender написа:';
 $labels['originalmessage'] = 'Оригинално писмо';
-
 $labels['editidents']    = 'Промени самоличности';
 $labels['spellcheck']    = 'Правопис';
 $labels['checkspelling'] = 'Проверка на правописа';
 $labels['resumeediting'] = 'Продължи черновата';
 $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['highest'] = 'Най-висок';
-
 $labels['nosubject']  = '(няма заглавие)';
 $labels['showimages'] = 'Показвай изображения';
 $labels['alwaysshow'] = 'Винаги показвай изображения от $sender';
@@ -252,25 +215,19 @@ $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'] = 'Забележка: Тази разписка потвърждава само, че писмото е било визуализирано на екрана на получателят. Няма никаква гаранция, че той е разбрал и/или дори прочел неговото съдържание.';
-
-// address boook
 $labels['name']         = 'Екранно име';
 $labels['firstname']    = 'Име';
 $labels['surname']      = 'Фамилия';
@@ -305,7 +262,6 @@ $labels['search'] = 'Търсене';
 $labels['advsearch'] = 'Разширено търсене';
 $labels['advanced'] = 'Търси';
 $labels['other'] = 'Други';
-
 $labels['typehome']   = 'Домашен';
 $labels['typework']   = 'Служебен';
 $labels['typeother']  = 'Друг';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'На асистент';
 $labels['typehomepage']  = 'Личен';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
-
 $labels['addfield'] = 'Друго поле...';
 $labels['addcontact'] = 'Добави нов контакт';
 $labels['editcontact'] = 'Редактирай контакт';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Данни на контакт';
 $labels['personalinfo'] = 'Лична информация';
-
 $labels['edit']   = 'Редактирай';
 $labels['cancel'] = 'Отказ';
 $labels['save']   = 'Запис';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Преименувай';
 $labels['addphoto'] = 'Добави';
 $labels['replacephoto'] = 'Замени';
 $labels['uploadphoto'] = 'Качване на снимка';
-
 $labels['newcontact']     = 'Нов контакт';
 $labels['deletecontact']  = 'Изтрий избраните контакти';
 $labels['composeto']      = 'Напиши писмо до';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Нова група контракти';
 $labels['grouprename']    = 'Преименувай групата';
 $labels['groupdelete']    = 'Изтрий групата';
 $labels['groupremoveselected'] = 'Премахни избраните контакти от групата';
-
 $labels['previouspage']   = 'Предишна страница';
 $labels['firstpage']      = 'Първа страница';
 $labels['nextpage']       = 'Следваща страница';
 $labels['lastpage']       = 'Последна страница';
-
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групи';
 $labels['listgroup'] = 'Покажи членове на групата';
 $labels['personaladrbook'] = 'Лични адреси';
-
 $labels['searchsave'] = 'Запази филтър';
 $labels['searchdelete'] = 'Изтрий филтър';
-
 $labels['import'] = 'Импорт';
 $labels['importcontacts'] = 'Импортиране на контакти';
 $labels['importfromfile'] = 'Импорт от файл:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Всички (създава групи ако е
 $labels['importgroupsexisting'] = 'Само за съществуващите групи';
 $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 писмо';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Обработва изскачащи прозор
 $labels['forwardmode'] = 'Препращай писмата';
 $labels['inline'] = 'цитирани в писмото';
 $labels['asattachment'] = 'като прикачен файл';
-
 $labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Име на папката';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Вид на папката';
 $labels['personalfolder']  = 'Лична папка';
 $labels['otherfolder']  = 'Папка на друг потребител';
 $labels['sharedfolder']  = 'Публична папка';
-
 $labels['sortby'] = 'Сортирай по';
 $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'] = 'Западна Европа';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Виетнамски';
 $labels['japanese'] = 'Японски';
 $labels['korean'] = 'Корейски';
 $labels['chinese'] = 'Китайски';
-
 ?>
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index f1038dfa1..210eda1b1 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Възникна грешка!';
 $messages['loginfailed']  = 'Неуспешно установяване на самоличност.';
 $messages['cookiesdisabled'] = 'Вашият браузър не приема cookies.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Търсеният контакт не е нам
 $messages['contactsearchonly'] = 'Използвайте полето за да търсите контакти';
 $messages['sendingfailed'] = 'Неуспешно изпращане на писмо.';
 $messages['senttooquickly'] = 'Моля изчакайте $sec секунди преди да изпратите писмото.';
-$messages['errorsavingsent'] = 'Възникна грешка при записване на изпратеното писмо.';
-$messages['errorsaving'] = 'Възникна грешка при записването.';
 $messages['errormoving'] = 'Писмото не може да бъде преместено.';
 $messages['errorcopying'] = 'Писмото не може да бъде копирано.';
 $messages['errordeleting'] = 'Писмото не може да бъде изтрито.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP грешка: $msg';
 $messages['emailformaterror'] = 'Невалиден e-mail адрес: $email';
 $messages['toomanyrecipients'] = 'Прекалено много адреси за изпращане (максимум: $max).';
 $messages['maxgroupmembersreached'] = 'Броят на членовете на групата е повече от максималния: $max.';
-$messages['internalerror'] = 'Възникна вътрешна грешка. Моля опитайте отново.';
 $messages['contactdelerror'] = 'Невъзможно изтриване на контакти.';
 $messages['contactdeleted'] = 'Контактът беше изтрит успешно.';
 $messages['contactrestoreerror'] = 'Неуспешно възстановяване на изтрите контакти.';
@@ -172,5 +167,4 @@ $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 1273ef192..c0b7ad3a7 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'স্বাগতম';
 $labels['username']  = 'গ্রাহক নাম (username)';
 $labels['password']  = 'গোপোন শব্দ (password)';
 $labels['server']    = 'সারভার';
 $labels['login']     = 'প্রবেশ';
-
-// taskbar
 $labels['logout']   = 'প্রস্থান';
 $labels['mail']     = 'ই-মেইল';
 $labels['settings'] = 'ব্যাক্তিগত খুটিনাটি';
 $labels['addressbook'] = 'ঠিকানার বই';
-
-// mailbox names
 $labels['inbox']  = 'প্রধান বাক্স';
 $labels['drafts'] = 'খসড়া';
 $labels['sent']   = 'প্রেরিত(পাঠানো মেইল)';
 $labels['trash']  = 'ডাস্টবিন';
 $labels['junk']   = 'আজেবাজে মেইল';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'বিষয়';
 $labels['from']    = 'প্রেরক';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'প্রাপক';
 $labels['cc']      = 'অনুলিপির ঠিকানা';
 $labels['bcc']     = 'নাজানিয়ে অনুলিপির ঠিকানা';
 $labels['replyto'] = 'উত্তর পাঠানোর ঠিকানা';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'তারিখ';
 $labels['size']    = 'সাইজ';
 $labels['priority'] = 'গুরুত্ব';
 $labels['organization'] = 'কোম্পানি';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'ফোল্ডার/মেইলবক্স';
 $labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr #মেইল/চিঠি , $count এর মধ্যে';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'অনুলিপির ঠিকানা';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ফাইলের নাম';
 $labels['filesize'] = 'ফাইলের সাইজ';
-
 $labels['addtoaddressbook'] = 'ঠিকানার বইতে ঢুকান';
-
-// weekdays short
 $labels['sun'] = 'রবি';
 $labels['mon'] = 'সোম';
 $labels['tue'] = 'মঙ্গল';
@@ -82,8 +55,6 @@ $labels['wed'] = 'বুধ';
 $labels['thu'] = 'বৃহ:';
 $labels['fri'] = 'শুক্র';
 $labels['sat'] = 'শনি';
-
-// weekdays long
 $labels['sunday']    = 'রবিবার';
 $labels['monday']    = 'সোমবার';
 $labels['tuesday']   = 'মঙ্গলবার';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'বুধবার';
 $labels['thursday']  = 'বৃহস্পতিবার';
 $labels['friday']    = 'শুক্রবার';
 $labels['saturday']  = 'শনিবার';
-
-// months short
 $labels['jan']	= 'জানুয়ারি';
 $labels['feb']	= 'ফেব্রুয়ারি';
 $labels['mar']	= 'মার্চ';
@@ -105,8 +74,6 @@ $labels['sep']	= 'সেপ্তেমবার';
 $labels['oct']	= 'অষ্টবার';
 $labels['nov']	= 'নবেমবার';
 $labels['dec']	= 'দিশেমবার';
-
-// months long
 $labels['longjan']	= 'জানুয়ারি';
 $labels['longfeb']	= 'ফেব্রুয়ারি';
 $labels['longmar']	= 'মার্চ';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'সেপ্তেমবার (September)';
 $labels['longoct']	= 'অষ্টবার (October)';
 $labels['longnov']	= 'নবেমবার (November)';
 $labels['longdec']	= 'দিশেমবার (December)';
-
 $labels['today'] = 'আজকে';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
 $labels['compose']          = 'নতুন মেইল/চিঠি লিখুন';
 $labels['writenewmessage']  = 'নতুন মেইল/চিঠি লিখুন';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
-$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'] = 'মেইল/চিঠি ডাস্টবিনে ফেলুন';
@@ -145,253 +102,98 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
 $labels['unknown']  = 'অজানা';
 $labels['unlimited']  = 'সীমাহীন';
-
 $labels['quicksearch']  = 'ঝটকরে খোজা';
 $labels['resetsearch']  = 'নতুনকরে খুজুন';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'জুড়ে দেওয়া ফাইল (Attachments)';
 $labels['upload'] = 'উঠায় দেন';
-$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['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'] = 'এই রসিদ খালি এতটুকু প্রমান করে যে প্রাপক চিঠিটি পেয়েছেন। কিন্তু তিনি ঠিকমতো পড়তে পেরেছেন কিনা অথবা তিনি পড়ে বুঝতে পেরেছেন কিনা তার কোনো প্রমান নেই।';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'বদলান';
 $labels['cancel'] = 'বাতিল';
 $labels['save']   = 'জমা দিন';
 $labels['delete'] = 'ফেলে দিন';
-$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['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['listgroup'] = 'List group members';
 $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']  = 'কম্পুটার নিজেনিজি বেছে নেবে';
@@ -400,13 +202,8 @@ $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 এ স্বাক্ষর';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ছোটোকরে দেখার জায়গা';
 $labels['skin'] = 'মেইলবক্স এর পুরোটার চেহারা';
 $labels['logoutclear'] = 'বেরহবার সময় ডাস্টবিন অটোমেটিক খালি হবে';
@@ -417,70 +214,26 @@ $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['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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'ফোল্ডার/মেইলবক্স';
 $labels['folders']  = 'ফোল্ডার/মেইলবক্স';
 $labels['foldername']  = 'ফোল্ডার/মেইলবক্স এর নাম';
@@ -490,54 +243,11 @@ $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['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 9de6c38de..ac744edee 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = 'চিঠি পাঠায় দেওয়া হচ্ছে';
@@ -48,31 +32,20 @@ $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['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['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']  = 'দয়া করে নামটি লিখুন';
@@ -84,93 +57,29 @@ $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'] = 'সারভার থেকে চিঠি আনা গেলোনা';
 $messages['fileuploaderror'] = 'ফাইলটা সারভারে উঠানো গেলোনা';
 $messages['filesizeerror'] = 'যে ফাইলটা উঠানোর চেষ্টা করলেন সেটি সর্বোচ্চ সাইজ $size এর থেকে বেশি';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'এইঠিকানাটা খালি পড়ার জন্যে';
 $messages['errorsavingcontact'] = 'ঠিকানা জমা রাখা গেলোনা';
 $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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 c88fd92a6..d503d1f4c 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -15,66 +15,46 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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ù';
-
-// mailbox names
 $labels['inbox']  = 'Boest degemer';
 $labels['drafts'] = 'Brouilhedoù';
 $labels['sent']   = 'Kaset';
 $labels['trash']  = 'Pod-lastez';
 $labels['junk']   = 'Stroboù';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Sujed';
 $labels['from']    = 'Eus';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Da';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Respont-da';
-$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['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['download'] = 'Pellgargañ';
-$labels['open']     = 'Open';
 $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';
@@ -82,8 +62,6 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Yao';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-
-// weekdays long
 $labels['sunday']    = 'Sul';
 $labels['monday']    = 'Lun';
 $labels['tuesday']   = 'Meurzh';
@@ -91,8 +69,6 @@ $labels['wednesday'] = 'Merc\'her';
 $labels['thursday']  = 'Yaou';
 $labels['friday']    = 'Gwener';
 $labels['saturday']  = 'Sadorn';
-
-// months short
 $labels['jan']	= 'Gen';
 $labels['feb']	= 'C\'hwe';
 $labels['mar']	= 'Meu';
@@ -105,8 +81,6 @@ $labels['sep']	= 'Gwe';
 $labels['oct']	= 'Her';
 $labels['nov']	= 'Du';
 $labels['dec']	= 'Ker';
-
-// months long
 $labels['longjan']	= 'Genver';
 $labels['longfeb']	= 'C\'hwevrer';
 $labels['longmar']	= 'Meurzh';
@@ -119,10 +93,7 @@ $labels['longsep']	= 'Gwengolo';
 $labels['longoct']	= 'Here';
 $labels['longnov']	= 'Du';
 $labels['longdec']	= 'Kerzu';
-
 $labels['today'] = 'Hiziv';
-
-// toolbar buttons
 $labels['refresh']          = 'Azgrenaat';
 $labels['checkmail']        = 'Gwiriañ kemennadoù nevez';
 $labels['compose']          = 'Skrivañ ur c\'hemennad nevez';
@@ -132,12 +103,8 @@ $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['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ñ';
@@ -145,399 +112,93 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Implijadur pladenn';
 $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['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'Restroù staget';
 $labels['upload'] = 'Stagañ';
-$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['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['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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Cheñch';
 $labels['cancel'] = 'Nullañ';
 $labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
-$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['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['listgroup'] = 'List group members';
 $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['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['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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Diskouez panel alberz';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$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['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 fd1674d80..7f724a24d 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'N\'eus ket c\'hoant toupinoù Hor merder';
@@ -25,20 +23,10 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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...';
@@ -48,129 +36,38 @@ $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['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['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['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['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';
 $messages['fileuploaderror'] = 'Fazi o treuzkas ar restr';
 $messages['filesizeerror'] = 'Re vras eo ar restr treuzkaset $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 61989e6b3..df58d8d60 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Sanduče';
 $labels['drafts'] = 'Skice';
 $labels['sent']   = 'Poslano';
 $labels['trash']  = 'Smeće';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Prikaži prava imena specijalnih foldera';
-
-// message listing
 $labels['subject'] = 'Naslov';
 $labels['from']    = 'Od';
 $labels['sender']  = 'Pošiljalac';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status poruke';
 $labels['listoptions'] = 'Izlistaj opcije...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Preuzmi';
 $labels['open']     = 'Otvori';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-
-// weekdays long
 $labels['sunday']    = 'Nedjelja';
 $labels['monday']    = 'Ponedjeljak';
 $labels['tuesday']   = 'Utorak';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Srijeda';
 $labels['thursday']  = 'Četvrtak';
 $labels['friday']    = 'Petak';
 $labels['saturday']  = 'Subota';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'Mart';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Septembar';
 $labels['longoct']	= 'Oktobar';
 $labels['longnov']	= 'Novembar';
 $labels['longdec']	= 'Decembar';
-
 $labels['today'] = 'Danas';
-
-// toolbar buttons
 $labels['refresh']          = 'Osvježi';
 $labels['checkmail']        = 'Provjeri ima li novih poruka';
 $labels['compose']          = 'Nova poruka';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Uvezi poruke';
-
 $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['body']  = 'Tijelo';
 $labels['type'] = 'Vrsta';
-
+$labels['namex'] = 'Ime';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
 $labels['changeformattext'] = 'Prikaži kao obični tekst';
 $labels['changeformathtml'] = 'Prikaži kao HTML';
-
-// message compose
 $labels['editasnew']      = 'Uredi kao novo';
 $labels['send']           = 'Pošalji';
 $labels['sendmessage']    = 'Pošalji poruku';
@@ -224,26 +192,22 @@ $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']    = 'Pravopis';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Nastavi uređivanje';
 $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['highest'] = 'Najveći';
-
 $labels['nosubject']  = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Ime za prikaz';
 $labels['firstname']    = 'Ime';
 $labels['surname']      = 'Prezime';
@@ -304,7 +262,6 @@ $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-
 $labels['typehome']   = 'Kućni broj';
 $labels['typework']   = 'Poslovni broj';
 $labels['typeother']  = 'Ostalo';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Otkaži';
 $labels['save']   = 'Sačuvaj';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Kreiraj novu grupu kontakata';
 $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['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['listgroup'] = 'Izlistaj članove 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:';
-$labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
+$labels['importtarget'] = 'Dodaj kontakte u';
 $labels['importreplace'] = 'Zamijeni cijeli adresar';
+$labels['importgroups'] = 'Uvezi grupne zadatke';
+$labels['importgroupsall'] = 'Sve (kreiraj grupe ako je potrebno)';
+$labels['importgroupsexisting'] = 'Samo za postojeće grupe';
 $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';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Tretiraj popup-ove kao standardne prozore';
 $labels['forwardmode'] = 'Prosljeđivanje poruka';
 $labels['inline'] = 'u istom redu';
 $labels['asattachment'] = 'kao prilog';
-
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folderi';
 $labels['foldername']  = 'Naziv foldera';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Vrsta foldera';
 $labels['personalfolder']  = 'Privatni folder';
 $labels['otherfolder']  = 'Folder drugog korisnika';
 $labels['sharedfolder']  = 'Javni folder';
-
 $labels['sortby'] = 'Sortiraj po';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'vijetnamski';
 $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 09e6df19e..3424013c5 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Vaš preglednik ne prihvata kolačiće.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Traženi kontakt nije pronađen.';
 $messages['contactsearchonly'] = 'Unesite neki pojam za pretragu';
 $messages['sendingfailed'] = 'Greška pri slanju poruke.';
 $messages['senttooquickly'] = 'Molimo sačekajte $sec sekundi prije slanja ove poruke.';
-$messages['errorsavingsent'] = 'Desila se greška pri snimanju poslane poruke.';
-$messages['errorsaving'] = 'Desila se greška pri snimanju.';
 $messages['errormoving'] = 'Nije moguće premjestiti poruke.';
 $messages['errorcopying'] = 'Nije moguće kopirati poruke.';
 $messages['errordeleting'] = 'Nije moguće obrisati poruke.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP greška: $msg';
 $messages['emailformaterror'] = 'Netačna email adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primaoca. Smanjite broj primaoca na $max.';
 $messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi maksimum od $max.';
-$messages['internalerror'] = 'Dogodila se interna greška. Molimo vas da pokušate ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
 $messages['contactdeleted'] = 'Kontakti su uspješno obrisani.';
 $messages['contactrestoreerror'] = 'Nije moguće vratiti obrisane kontakte.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Nije moguće kreirati/premjestiti folder u oda
 $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 ca0129de4..065431fbc 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Safata d\'entrada';
 $labels['drafts'] = 'Esborranys';
 $labels['sent']   = 'Enviats';
 $labels['trash']  = 'Paperera';
 $labels['junk']   = 'Correu brossa';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Mostra els noms reals a les carpetes especials';
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
 $labels['sender']  = 'Remitent';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organització';
 $labels['readstatus'] = 'Estat de lectura';
 $labels['listoptions'] = 'Llista d\'opcions...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Descarrega';
 $labels['open']     = 'Obre';
 $labels['showattachment'] = 'Mostra';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Dmc';
 $labels['thu'] = 'Dij';
 $labels['fri'] = 'Div';
 $labels['sat'] = 'Dis';
-
-// weekdays long
 $labels['sunday']    = 'Diumenge';
 $labels['monday']    = 'Dilluns';
 $labels['tuesday']   = 'Dimarts';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Dimecres';
 $labels['thursday']  = 'Dijous';
 $labels['friday']    = 'Divendres';
 $labels['saturday']  = 'Dissabte';
-
-// months short
 $labels['jan']	= 'gen';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'set';
 $labels['oct']	= 'oct';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'des';
-
-// months long
 $labels['longjan']	= 'gener';
 $labels['longfeb']	= 'febrer';
 $labels['longmar']	= 'març';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'setembre';
 $labels['longoct']	= 'octubre';
 $labels['longnov']	= 'novembre';
 $labels['longdec']	= 'desembre';
-
 $labels['today'] = 'Avui';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualitza';
 $labels['checkmail']        = 'Recupera missatges nous';
 $labels['compose']          = 'Escriu un missatge';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Més accions...';
 $labels['more']             = 'Més';
 $labels['back']             = 'Torna';
 $labels['options']          = 'Opcions';
-
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Importa missatges';
 $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['body']  = 'Cos';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'tipus:';
+$labels['namex'] = 'Nom';
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
 $labels['changeformattext'] = 'Mostra en format de text net';
 $labels['changeformathtml'] = 'Mostra en format HTML';
-
-// message compose
 $labels['editasnew']      = 'Edita com a nou';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Envia el missatge';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Comprova l\'ortografia';
 $labels['resumeediting'] = 'Reprèn l\'edició';
 $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['highest'] = 'La més alta';
-
 $labels['nosubject']  = '(sense assumpte)';
 $labels['showimages'] = 'Mostra les imatges';
 $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
@@ -251,25 +215,19 @@ $labels['isdraft']    = 'Aquest és un missatge esborrany.';
 $labels['andnmore']   = '$nr més...';
 $labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
 $labels['togglefullheaders'] = 'Conmuta les capçaleres de text cru';
-
 $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.';
-
-// address boook
 $labels['name']         = 'Nom a mostrar';
 $labels['firstname']    = 'Nom';
 $labels['surname']      = 'Cognom';
@@ -304,7 +262,6 @@ $labels['search'] = 'Cerca';
 $labels['advsearch'] = 'Cerca Avançada';
 $labels['advanced'] = 'Paràmetres avançats';
 $labels['other'] = 'Un altre';
-
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Feina';
 $labels['typeother']  = 'Un altre';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Cancel·la';
 $labels['save']   = 'Desa';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
 $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['group'] = 'Grup';
 $labels['groups'] = 'Grups';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Llista els membres del grup';
 $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'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importació d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).';
 $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';
@@ -406,7 +350,7 @@ $labels['htmleditor'] = 'Escriu missatges en HTML';
 $labels['htmlonreply'] = 'només en resposta a missatges en HTML';
 $labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML';
 $labels['htmlsignature'] = 'Signatura en HTML';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Mostra l\'adreça electrònica amb el nom';
 $labels['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
 $labels['logoutclear'] = 'Buida la paperera al tancar la sessió';
@@ -476,11 +420,10 @@ $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['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Gestiona les finestres emergents com si fossin finestres normals';
 $labels['forwardmode'] = 'Reenviament de missatges';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
-
 $labels['folder']  = 'Carpeta';
 $labels['folders']  = 'Carpetes';
 $labels['foldername']  = 'Nom de la carpeta';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Tipus de Carpeta';
 $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['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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 9ee32d54e..06a72cb50 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'El vostre navegador no accepta cookies.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'No s\'ha trobat el contacte sol·licitat.';
 $messages['contactsearchonly'] = 'Introduïu termes de cerca per trobar contactes';
 $messages['sendingfailed'] = 'Error enviant el missatge.';
 $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.';
-$messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat.';
-$messages['errorsaving'] = 'Hi ha hagut un error mentre s\'estava desant.';
 $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(s) missatge(s).';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreça de correu no vàlida: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Reduïu el nombre de destinataris a $max.';
 $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el màxim de $max.';
-$messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar.';
 $messages['contactdelerror'] = 'No s\'han pogut suprimir el(s) contacte(s).';
 $messages['contactdeleted'] = 'Contacte(s) suprimit(s) correctament.';
 $messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimit(s).';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'No s\'ha pogut crear/moure la carpeta dins de
 $messages['messagetoobig'] = 'La part del missatge és massa gran per processar-la.';
 $messages['attachmentvalidationerror'] = 'ATENCIÓ! Aquest adjunt és sospitós perquè el seu tipus no coincideix amb el tipus declarat al missatge. Si no confieu en l\'emissor, no l\'hauríeu d\'obrir al navegador perquè pot contenir elements maliciosos. <br/><br/><em>S\'esperava: $expected; s\'ha trobat: $detected</em>';
 $messages['noscriptwarning'] = 'Atenció: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, heu d\'activar Javascript a les opcions del navegador.';
-
 ?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index b5cc093d8..d887d8d0a 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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ář';
-
-// mailbox names
 $labels['inbox']  = 'Příchozí pošta';
 $labels['drafts'] = 'Rozepsané';
 $labels['sent']   = 'Odeslané';
 $labels['trash']  = 'Koš';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Zobrazit skutečná jména speciálních složek';
-
-// message listing
 $labels['subject'] = 'Předmět';
 $labels['from']    = 'Odesílatel';
 $labels['sender']  = 'Odesílatel';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizace';
 $labels['readstatus'] = 'Přečteno';
 $labels['listoptions'] = 'Seznam  možností ...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'stáhnout';
 $labels['open']     = 'Otevřít';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Čt';
 $labels['fri'] = 'Pá';
 $labels['sat'] = 'So';
-
-// weekdays long
 $labels['sunday']    = 'Neděle';
 $labels['monday']    = 'Pondělí';
 $labels['tuesday']   = 'Úterý';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Středa';
 $labels['thursday']  = 'Čtvrtek';
 $labels['friday']    = 'Pátek';
 $labels['saturday']  = 'Sobota';
-
-// months short
 $labels['jan']	= 'Led';
 $labels['feb']	= 'Úno';
 $labels['mar']	= 'Bře';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Zář';
 $labels['oct']	= 'Říj';
 $labels['nov']	= 'Lis';
 $labels['dec']	= 'Pro';
-
-// months long
 $labels['longjan']	= 'Leden';
 $labels['longfeb']	= 'Únor';
 $labels['longmar']	= 'Březen';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Září';
 $labels['longoct']	= 'Říjen';
 $labels['longnov']	= 'Listopad';
 $labels['longdec']	= 'Prosinec';
-
 $labels['today'] = 'Dnes';
-
-// toolbar buttons
 $labels['refresh']          = 'Obnovit';
 $labels['checkmail']        = 'Zkontrolovat nové zprávy';
 $labels['compose']          = 'Napsat zprávu';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import zpráv';
-
 $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['body']  = 'Tělo';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Jméno';
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
 $labels['changeformattext'] = 'Zobrazit v textovém formátu';
 $labels['changeformathtml'] = 'Zobrazit v HTML formátu';
-
-// message compose
 $labels['editasnew']      = 'Upravit jako novou';
 $labels['send']           = 'Odeslat';
 $labels['sendmessage']    = 'Odeslat zprávu nyní';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Zkontrolovat pravopis';
 $labels['resumeediting'] = 'Pokračovat v úpravách';
 $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['highest'] = 'Nejvyšší';
-
 $labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Zobrazit jméno';
 $labels['firstname']    = 'Jméno';
 $labels['surname']      = 'Příjmení';
@@ -304,7 +262,6 @@ $labels['search'] = 'Hledat';
 $labels['advsearch'] = 'Pokročilé vyhledávání';
 $labels['advanced'] = 'Pokročilé';
 $labels['other'] = 'Ostatní';
-
 $labels['typehome']   = 'Domací';
 $labels['typework']   = 'Pracovní';
 $labels['typeother']  = 'Ostatní';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Konec';
 $labels['save']   = 'Uložit';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Vytvořit novou skupinu kontaktů';
 $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['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['listgroup'] = ' Seznam členů 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['importtarget'] = 'Přidat kontakty k';
 $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
+$labels['importgroups'] = 'Importovat přiřazení do skupin';
+$labels['importgroupsall'] = 'Vše (vytvořit skupiny v případě potřeby)';
+$labels['importgroupsexisting'] = 'Pouze pro existující skupiny';
 $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';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Zacházet s vyskakovacími okny jako se standardn�
 $labels['forwardmode'] = 'Přeposlat zprávu';
 $labels['inline'] = 'vloženě';
 $labels['asattachment'] = 'jako přílohu';
-
 $labels['folder']  = 'Složka';
 $labels['folders']  = 'Složky';
 $labels['foldername']  = 'Jméno složky';
@@ -501,26 +448,20 @@ $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['sortby'] = 'Seřadit podle';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamština';
 $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 59b2c6bd6..0bd6b0e82 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Váš prohlížeč nepodporuje cookies, které jsou pro přihlášení nezbytné';
@@ -101,13 +99,16 @@ $messages['converting'] = 'Odstraňuji formátování ze zprávy...';
 $messages['messageopenerror'] = 'Nemohu načíst zprávu ze serveru';
 $messages['fileuploaderror'] = 'Nahrávání souboru selhalo';
 $messages['filesizeerror'] = 'Soubor přesáhl maximální velikost $size';
-$messages['copysuccess'] = 'Úspěšně zkopírováno $nr adres';
-$messages['copyerror'] = 'Nemohu zkopírovat žádnou adresu';
+$messages['copysuccess'] = 'Úspěšně zkopírováno $nr kontaktů.';
+$messages['movesuccess'] = 'Úspěšně přesunuto $nr kontaktů.';
+$messages['copyerror'] = 'Kontakty nelze kopírovat.';
+$messages['moveerror'] = 'Kontakty nelze přesunout.';
 $messages['sourceisreadonly'] = 'Tento zdroj adres je pouze pro čtení';
 $messages['errorsavingcontact'] = 'Nemohu uložit adresu kontaktu';
 $messages['movingmessage'] = 'Přesouvám zprávu...';
 $messages['copyingmessage'] = 'Kopíruji zprávu...';
 $messages['copyingcontact'] = 'Kopíruji kontakty...';
+$messages['movingcontact'] = 'Přesouvání kontaktů()...';
 $messages['deletingmessage'] = 'Odstraňuji zprávu...';
 $messages['markingmessage'] = 'Označuji zprávu...';
 $messages['addingmember'] = 'Přidávám kontakty do skupiny...';
@@ -141,7 +142,7 @@ $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Příliš mnoho příjemců. Změňte počet příjemců na $max.';
 $messages['maxgroupmembersreached'] = 'Počet členských skupin dosáhl maximum z $max';
-$messages['internalerror'] = 'Došlo k interní chybě. Zkuste to znovu';
+$messages['internalerror'] = 'Došlo k interní chybě. Zkuste to prosím znovu.';
 $messages['contactdelerror'] = 'Kontakty nelze odstranit';
 $messages['contactdeleted'] = 'Kontakty byly odstraněny';
 $messages['contactrestoreerror'] = 'Nelze obnovit smazané kontakty';
@@ -169,5 +170,4 @@ $messages['parentnotwritable'] = 'Nelze vytvořit/přesunout složku do vybrané
 $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 ea5d047c9..37ee5bbc1 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Mewnflwch';
 $labels['drafts'] = 'Drafftiau';
 $labels['sent']   = 'Danfonwyd';
 $labels['trash']  = 'Sbwriel';
 $labels['junk']   = 'Sothach';
 $labels['show_real_foldernames'] = 'Dangos enwau go-iawn ar gyfer ffolderi arbennig';
-
-// message listing
 $labels['subject'] = 'Pwnc';
 $labels['from']    = 'Anfonwr';
 $labels['sender']  = 'Anfonwr';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Blaenoriaeth';
 $labels['organization'] = 'Enw\'r Sefydliad';
 $labels['readstatus'] = 'Statws darllen';
 $labels['listoptions'] = 'Dewisiadau rhestr...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Llwytho lawr';
 $labels['open']     = 'Agor';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Iau';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-
-// weekdays long
 $labels['sunday']    = 'Dydd Sul';
 $labels['monday']    = 'Dydd Llun';
 $labels['tuesday']   = 'Dydd Mawrth';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Dydd Mercher';
 $labels['thursday']  = 'Dydd Iau';
 $labels['friday']    = 'Dydd Gwener';
 $labels['saturday']  = 'Dydd Sadwrn';
-
-// months short
 $labels['jan']	= 'Ion';
 $labels['feb']	= 'Chwe';
 $labels['mar']	= 'Maw';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Med';
 $labels['oct']	= 'Hyd';
 $labels['nov']	= 'Tach';
 $labels['dec']	= 'Rhag';
-
-// months long
 $labels['longjan']	= 'Ionawr';
 $labels['longfeb']	= 'Chwefror';
 $labels['longmar']	= 'Mawrth';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Medi';
 $labels['longoct']	= 'Hydref';
 $labels['longnov']	= 'Tachwedd';
 $labels['longdec']	= 'Rhagfyr';
-
 $labels['today'] = 'Heddiw';
-
-// toolbar buttons
 $labels['refresh']          = 'Ail-ofyn';
 $labels['checkmail']        = 'Edrych am negeseuon newydd';
 $labels['compose']          = 'Ysgrifennu neges';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mwy o weithredoedd...';
 $labels['more']             = 'Mwy';
 $labels['back']             = 'Yn ôl';
 $labels['options']          = 'Dewisiadau';
-
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
 $labels['none'] = 'Dim';
@@ -174,7 +148,6 @@ $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';
@@ -190,16 +163,13 @@ $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['importmessages'] = 'Mewnforio negeseuon';
-
 $labels['quota'] = 'Defnydd';
 $labels['unknown']  = 'anhysbys';
 $labels['unlimited']  = 'diderfyn';
-
 $labels['quicksearch']  = 'Chwiliad cyflym';
 $labels['resetsearch']  = 'Ail-osod chwiliad';
 $labels['searchmod']  = 'Addasyddion chwilio';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Y neges yn llawn';
 $labels['body']  = 'Corff';
 $labels['type'] = 'Math';
 $labels['namex'] = 'Enw';
-
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
 $labels['changeformattext'] = 'Dangos mewn fformat testun plaen';
 $labels['changeformathtml'] = 'Dangos mewn fformat HTML';
-
-// message compose
 $labels['editasnew']      = 'Golygu fel neges newydd';
 $labels['send']           = 'Anfon';
 $labels['sendmessage']    = 'Danfon nawr';
@@ -225,26 +192,22 @@ $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['checkspelling'] = 'Gwirio sillafu';
 $labels['resumeediting'] = 'Ail-ddechrau golygu';
 $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['highest'] = 'Uchaf';
-
 $labels['nosubject']  = '(dim pwnc)';
 $labels['showimages'] = 'Dangos lluniau';
 $labels['alwaysshow'] = 'Dangos lluniau bob amser o $sender';
@@ -252,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Enw ddangosir';
 $labels['firstname']    = 'Enw cyntaf';
 $labels['surname']      = 'Enw olaf';
@@ -305,7 +262,6 @@ $labels['search'] = 'Chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
 $labels['advanced'] = 'Uwch';
 $labels['other'] = 'Arall';
-
 $labels['typehome']   = 'Cartref';
 $labels['typework']   = 'Gwaith';
 $labels['typeother']  = 'Arall';
@@ -320,14 +276,12 @@ $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['cancel'] = 'Canslo';
 $labels['save']   = 'Cadw';
@@ -336,7 +290,6 @@ $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';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Creu grŵp cysylltiadau newydd';
 $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['group'] = 'Grŵp';
 $labels['groups'] = 'Grwpiau';
 $labels['listgroup'] = 'Rhestru aelodau\'r grŵp';
 $labels['personaladrbook'] = 'Cyfeiriadau Personol';
-
 $labels['searchsave'] = 'Cadw chwiliad';
 $labels['searchdelete'] = 'Dileu chwiliad';
-
 $labels['import'] = 'Mewnforio';
 $labels['importcontacts'] = 'Mewnforio cysylltiadau';
 $labels['importfromfile'] = 'Mewnforio o ffeil:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Holl (creu grwpiau os oes angen)';
 $labels['importgroupsexisting'] = 'Dim ond ar gyfer grwpiau sy\'n bodoli';
 $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';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Trin ffenestri naid fel ffenestri arferol';
 $labels['forwardmode'] = 'Danfon neges ymlaen';
 $labels['inline'] = 'mewnlin';
 $labels['asattachment'] = 'fel atodiad';
-
 $labels['folder']  = 'Ffolder';
 $labels['folders']  = 'Ffolderi';
 $labels['foldername']  = 'Enw ffolder';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Math Ffolder';
 $labels['personalfolder']  = 'Ffolder Preifat';
 $labels['otherfolder']  = 'Ffolder Defnyddiwr Arall';
 $labels['sharedfolder']  = 'Ffolder Cyhoeddus';
-
 $labels['sortby'] = 'Trefnu yn ôl';
 $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';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Fietnamaidd';
 $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 6323d8c9c..5dd8230c7 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Nid yw eich porwr yn derbyn cwcis';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Ni gafwyd hyd i\'r cysylltiad gofynnwyd amdano';
 $messages['contactsearchonly'] = 'Rhowch dermau chwilio i ganfod cysylltiadau';
 $messages['sendingfailed'] = 'Methwyd danfon y neges';
 $messages['senttooquickly'] = 'Arhoswch $sec eiliad cyn danfon y neges';
-$messages['errorsavingsent'] = 'Fe gafwyd gwall wrth cadw\'r neges ddanfonwyd';
-$messages['errorsaving'] = 'Fe gafwyd gwall wrth gadw';
 $messages['errormoving'] = 'Methwyd symud y neges';
 $messages['errorcopying'] = 'Methwyd copïo\'r neges(euon)';
 $messages['errordeleting'] = 'Methwyd dileu y neges';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Gwall SMTP: $msg';
 $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email';
 $messages['toomanyrecipients'] = 'Gormod o dderbynnwyr. Lleihewch y nifer i $max';
 $messages['maxgroupmembersreached'] = 'Mae nifer o aelodau\'r grŵp yn fwy na\'r uchafswm o $max';
-$messages['internalerror'] = 'Fe gafwyd gwall mewnol. Rhowch gynnig arni eto.';
 $messages['contactdelerror'] = 'Methwyd dileu cyswllt';
 $messages['contactdeleted'] = 'Cyswllt wedi ei ddileu yn llwyddiannus';
 $messages['contactrestoreerror'] = 'Methwyd adfer y cyswllt/cysylltiadau a ddilëwyd';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Methwyd creu/symud ffolder i\'r ffolder rhiant
 $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 a5b9b3bc8..52de86d92 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Velkommen til $product';
 $labels['username']  = 'Brugernavn';
 $labels['password']  = 'Adgangskode';
 $labels['server']    = 'Server';
 $labels['login']     = 'Log på';
-
-// taskbar
 $labels['logout']   = 'Log af';
 $labels['mail']     = 'E-mail';
 $labels['settings'] = 'Indstillinger';
 $labels['addressbook'] = 'Adressebog';
-
-// mailbox names
 $labels['inbox']  = 'Indbakke';
 $labels['drafts'] = 'Kladder';
 $labels['sent']   = 'Sendt post';
 $labels['trash']  = 'Papirkurv';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Vis rigtige navne for specielle mapper';
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Afsender';
 $labels['sender']  = 'Afsender';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Firma';
 $labels['readstatus'] = 'Læst status';
 $labels['listoptions'] = 'Listeindstillinger';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Download';
 $labels['open']     = 'Åben';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-
-// weekdays long
 $labels['sunday']    = 'Søndag';
 $labels['monday']    = 'Mandag';
 $labels['tuesday']   = 'Tirsdag';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
 $labels['saturday']  = 'Lørdag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'Marts';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'December';
-
 $labels['today'] = 'I dag';
-
-// toolbar buttons
 $labels['refresh']          = 'Opdatér';
 $labels['checkmail']        = 'Se efter nye beskeder';
 $labels['compose']          = 'Ny besked';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Flere funktioner...';
 $labels['more']             = 'Mere';
 $labels['back']             = 'Tilbage';
 $labels['options']          = 'Indstillinger';
-
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Importer beskeder';
 $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['body']  = 'Body';
 $labels['type'] = 'Type';
-
+$labels['namex'] = 'Navn';
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst format';
 $labels['changeformathtml'] = 'Vis i HTML format';
-
-// message compose
 $labels['editasnew']      = 'Redigér som ny';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send besked';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Stavekontrol';
 $labels['resumeediting'] = 'Genoptag redigering';
 $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['highest'] = 'Højest';
-
 $labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis billeder';
 $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
@@ -251,25 +215,19 @@ $labels['isdraft']    = 'Dette er en kladde.';
 $labels['andnmore']   = '$nr yderligere...';
 $labels['togglemoreheaders'] = 'Vis yderligere headers';
 $labels['togglefullheaders'] = 'Ændre rå brevhoveder';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
 $labels['savesentmessagein'] = 'Gem afsendt besked i';
 $labels['dontsave'] = 'gem ikke';
 $labels['maxuploadsize'] = 'Maksimale tilladte filstørrelse er $size';
-
 $labels['addcc'] = 'Tilføj Cc';
 $labels['addbcc'] = 'Tilføj Bcc';
 $labels['addreplyto'] = 'Tilføj Svar-Til adresse';
 $labels['addfollowupto'] = 'Tilføj følg-op adresse';
-
-// mdn
 $labels['mdnrequest'] = 'Afsenderen af denne besked har bedt om at modtage en bekræftelse når du læser beskeden. Vil du sende kvittering for læsning?';
 $labels['receiptread'] = 'Send kvittering for læsning';
 $labels['yourmessage'] = 'Dette er en kvittering for at din besked er blevet vist';
 $labels['receiptnote'] = 'Bemærk: Denne kvittering bekræfter udelukkende at beskeden blev vist på modtagerens computer. Der er ingen garanti for at modtageren har læst eller forstået beskedens indhold.';
-
-// address boook
 $labels['name']         = 'Vist navn';
 $labels['firstname']    = 'Fornavn';
 $labels['surname']      = 'Efternavn';
@@ -304,7 +262,6 @@ $labels['search'] = 'Søg';
 $labels['advsearch'] = 'Avanceret søg';
 $labels['advanced'] = 'Avanceret';
 $labels['other'] = 'Andet';
-
 $labels['typehome']   = 'Hjem';
 $labels['typework']   = 'Arbejde';
 $labels['typeother']  = 'Andet';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Annullér';
 $labels['save']   = 'Gem';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
 $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['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Vis gruppemedlemmer';
 $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';
@@ -480,7 +424,6 @@ $labels['standardwindows'] = 'Behandl popups som standardvinduer';
 $labels['forwardmode'] = 'Videresendelse af besked';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'som vedhæftning';
-
 $labels['folder']  = 'Mappe';
 $labels['folders']  = 'Mapper';
 $labels['foldername']  = 'Mappenavn';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Mappetype';
 $labels['personalfolder']  = 'Privat mappe';
 $labels['otherfolder']  = 'Anden brugers mappe';
 $labels['sharedfolder']  = 'Offentlig mappe';
-
 $labels['sortby'] = 'Sortér efter';
 $labels['sortasc']  = 'Ældste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Fortryd';
-
 $labels['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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $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 7429fd4e5..c12236eef 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Din browser accepterer ikke cookies.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Den søgte kontakt blev ikke fundet.';
 $messages['contactsearchonly'] = 'Indtast søgeord for at finde kontakter.';
 $messages['sendingfailed'] = 'Beskeden kunne ikke sendes.';
 $messages['senttooquickly'] = 'Vent venligst $sec sekunder før du sender denne besked.';
-$messages['errorsavingsent'] = 'Der opstod en fejl da den sendte besked blev gemt.';
-$messages['errorsaving'] = 'Der opstod en fejl under gemning.';
 $messages['errormoving'] = 'Beskeden kunne ikke flyttes.';
 $messages['errorcopying'] = 'Beskeden kunne ikke kopieres.';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP fejl: $msg';
 $messages['emailformaterror'] = 'Ugyldig e-mailadresse: $email';
 $messages['toomanyrecipients'] = 'For mange modtagere. Reducer antallet af modtagere til $max.';
 $messages['maxgroupmembersreached'] = 'Antallet af gruppemedlemmer overstiger maksimum på $max.';
-$messages['internalerror'] = 'Der opstod en intern fejl - prøv venligst igen.';
 $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er).';
 $messages['contactdeleted'] = 'Kontakt(er) slettet.';
 $messages['contactrestoreerror'] = 'Kunne ikke gendanne slettede kontakt(er).';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Kan ikke oprette/flytte mappe ind i valgt mapp
 $messages['messagetoobig'] = 'Denne del af beskeden er for stor til at blive behandlet.';
 $messages['attachmentvalidationerror'] = 'ADVARSEL! Den vedhæftede fil er mistænkelig - Typen stemmer ikke overens med den oplyste type. Hvis du ikke har tillid til afsender, skal du ikke åbne filen da den kan indholde onsindet indhold. <br/><br/><em>Forventet: $expected; Fundet: $detected</em>';
 $messages['noscriptwarning'] = 'Advarsel: Denne webmailclient kræver Javascript! For at kunne bruge den slå venligst Javascripts til i din browserindstillinger.';
-
 ?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 145a45f57..e5fe1ec66 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Willkommen bei $product';
 $labels['username']  = 'Benutzername';
 $labels['password']  = 'Passwort';
 $labels['server']    = 'Server';
 $labels['login']     = 'Login';
-
-// taskbar
 $labels['logout']   = 'Logout';
 $labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
-
-// mailbox names
 $labels['inbox']  = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
 $labels['sent']   = 'Gesendet';
 $labels['trash']  = 'Gelöscht';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Spezialordner nicht übersetzen';
-
-// message listing
 $labels['subject'] = 'Betreff';
 $labels['from']    = 'Von';
 $labels['sender']  = 'Absender';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['listoptions'] = 'Listenoptionen...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Download';
 $labels['open']     = 'Öffnen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
-
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigrösse';
-
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
-
-// weekdays short
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mi';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Fr';
 $labels['sat'] = 'Sa';
-
-// weekdays long
 $labels['sunday']    = 'Sonntag';
 $labels['monday']    = 'Montag';
 $labels['tuesday']   = 'Dienstag';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mittwoch';
 $labels['thursday']  = 'Donnerstag';
 $labels['friday']    = 'Freitag';
 $labels['saturday']  = 'Samstag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mär';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dez';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'März';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Dezember';
-
 $labels['today'] = 'Heute';
-
-// toolbar buttons
 $labels['refresh']          = 'Aktualisieren';
 $labels['checkmail']        = 'Auf neue Nachrichten prüfen';
 $labels['compose']          = 'Schreiben';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mehr ...';
 $labels['more']             = 'Mehr';
 $labels['back']             = 'Zurück';
 $labels['options']          = 'Optionen';
-
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
@@ -174,7 +148,6 @@ $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';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
-
 $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
 $labels['importmessages'] = 'Nachrichten importieren';
-
 $labels['quota'] = 'Verwendeter Speicherplatz';
 $labels['unknown']  = 'unbekannt';
 $labels['unlimited']  = 'unlimitiert';
-
 $labels['quicksearch']  = 'Schnellsuche';
 $labels['resetsearch']  = 'Löschen';
 $labels['searchmod']  = 'Suchkriterien ändern';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Ganze Nachricht';
 $labels['body']  = 'Inhalt';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Name';
-
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
 $labels['changeformattext'] = 'Als reiner Text anzeigen';
 $labels['changeformathtml'] = 'Als original HTML anzeigen';
-
-// message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
 $labels['send']           = 'Senden';
 $labels['sendmessage']    = 'Nachricht jetzt senden';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Empfangsbestätigung (MDN)';
 $labels['dsn']            = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
-
 $labels['editidents']    = 'Absender bearbeiten';
 $labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
 $labels['revertto']      = 'Zurück zu';
-
 $labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
 $labels['close']  = 'Schliessen';
 $labels['messageoptions']  = 'Optionen...';
-
 $labels['low']     = 'Niedrig';
 $labels['lowest']  = 'Niedrigste';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Hoch';
 $labels['highest'] = 'Höchste';
-
 $labels['nosubject']  = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Dies ist ein Entwurf';
 $labels['andnmore']   = '$nr weitere...';
 $labels['togglemoreheaders'] = 'Weitere Kopfzeilen anzeigen';
 $labels['togglefullheaders'] = 'Original-Kopfzeilen ein-/ausblenden';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
 $labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse 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 hat eine Empfangsbestätigung angefordert. Möchten Sie diese jetzt senden?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dieses ist eine Empfangsbestätigung für Ihre Nachricht';
 $labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dieses ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
-
-// address boook
 $labels['name']         = 'Anzeigename';
 $labels['firstname']    = 'Vorname';
 $labels['surname']      = 'Nachname';
@@ -305,7 +262,6 @@ $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Erweiterte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
-
 $labels['typehome']   = 'Zuhause';
 $labels['typework']   = 'Arbeit';
 $labels['typeother']  = 'Andere';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'Assistent';
 $labels['typehomepage']  = 'Homepage';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
-
 $labels['addfield'] = 'Feld hinzufügen...';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
 $labels['personalinfo'] = 'Persönliche Informationen';
-
 $labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Hinzufügen';
 $labels['replacephoto'] = 'Ersetzen';
 $labels['uploadphoto'] = 'Bild hochladen';
-
 $labels['newcontact']     = 'Neuen Kontakt erfassen';
 $labels['deletecontact']  = 'Gewählte Kontakte löschen';
 $labels['composeto']      = 'Nachricht verfassen';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
 $labels['grouprename']    = 'Gruppe umbenennen';
 $labels['groupdelete']    = 'Gruppe löschen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
-
 $labels['previouspage']   = 'Eine Seite zurück';
 $labels['firstpage']      = 'Erste Seite';
 $labels['nextpage']       = 'Nächste Seite';
 $labels['lastpage']       = 'Letzte Seite';
-
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
 $labels['listgroup'] = 'Gruppenmitglieder anzeigen';
 $labels['personaladrbook'] = 'Persönliches Adressbuch';
-
 $labels['searchsave'] = 'Suche speichern';
 $labels['searchdelete'] = 'Suche löschen';
-
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Adressen importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Alle (nicht vorhandene Gruppen erstellen)';
 $labels['importgroupsexisting'] = 'Für für existierende Gruppen';
 $labels['importdesc'] = 'Sie können Kontakte aus einem bestehenden Adressbuch hochladen.rnEs können Adressbücher im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a>- oder CSV-Format importiert werden.';
 $labels['done'] = 'Fertig';
-
-// settings
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Einstellungen bearbeiten';
-
 $labels['identities'] = 'Absender';
 $labels['manageidentities'] = 'Absender für dieses Konto verwalten';
 $labels['newidentity'] = 'Neuer Absender';
-
 $labels['newitem'] = 'Neuer Eintrag';
 $labels['edititem'] = 'Eintrag bearbeiten';
-
 $labels['preferhtml'] = 'HTML bevorzugen';
 $labels['defaultcharset'] = 'Standard-Zeichensatz';
 $labels['htmlmessage'] = 'HTML Nachricht';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Popups als normale Browserfenster öffnen';
 $labels['forwardmode'] = 'Weiterleiten einer Nachricht';
 $labels['inline'] = 'eingebettet';
 $labels['asattachment'] = 'als Anhang';
-
 $labels['folder']  = 'Ordner';
 $labels['folders']  = 'Ordner';
 $labels['foldername']  = 'Ordnername';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Ordnertyp';
 $labels['personalfolder']  = 'Privater Ordner';
 $labels['otherfolder']  = 'Order eines anderen Benutzers';
 $labels['sharedfolder']  = 'Öffentlicher Ordner';
-
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc']  = 'aufsteigend sortieren';
 $labels['sortdesc'] = 'absteigend sortieren';
 $labels['undo'] = 'Rückgängig';
-
 $labels['installedplugins'] = 'Installierte Plugins';
 $labels['plugin'] = 'Plugin';
 $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'] = 'Westeuropäisch';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamesisch';
 $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
-
 ?>
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 13615d4a7..4e5ccaa46 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Fehlermeldung';
 $messages['loginfailed']  = 'Login fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Die gewählte Adresse wurde nicht gefunden';
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
 $messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Beim Speichern der gesendeten Nachricht ist ein Fehler aufgetreten.';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
 $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.';
 $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
 $messages['contactdelerror'] = 'Fehler beim Löschen.';
 $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben.
 $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 $messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, da sein Dateityp nicht dem entspricht, was in der Nachricht angegeben wird. Wenn Sie dem Absender nicht vertrauen, sollten Sie diesen Anhang nicht im Browser öffnen, da er Ihrem Computer Schaden zuführen könnte. <br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
 $messages['noscriptwarning'] = 'Achtung! Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
-
 ?>
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 662ad2c70..e3f4652cc 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
 $labels['sent']   = 'Gesendet';
 $labels['trash']  = 'Gelöscht';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Echte Namen für Spezialordner anzeigen';
-
-// message listing
 $labels['subject'] = 'Betreff';
 $labels['from']    = 'Von';
 $labels['sender']  = 'Absender';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['listoptions'] = 'Listenoptionen...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Herunterladen';
 $labels['open']     = 'Offen';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mi';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Fr';
 $labels['sat'] = 'Sa';
-
-// weekdays long
 $labels['sunday']    = 'Sonntag';
 $labels['monday']    = 'Montag';
 $labels['tuesday']   = 'Dienstag';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mittwoch';
 $labels['thursday']  = 'Donnerstag';
 $labels['friday']    = 'Freitag';
 $labels['saturday']  = 'Samstag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mär';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dez';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'März';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Dezember';
-
 $labels['today'] = 'Heute';
-
-// toolbar buttons
 $labels['refresh']          = 'Aktualisieren';
 $labels['checkmail']        = 'Auf neue Nachrichten überprüfen';
 $labels['compose']          = 'Schreiben';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mehr...';
 $labels['more']             = 'Mehr';
 $labels['back']             = 'Zurück';
 $labels['options']          = 'Optionen';
-
 $labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
-
 $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
 $labels['importmessages'] = 'Nachrichten importieren';
-
 $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['body']  = 'Inhalt';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Name';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
 $labels['changeformattext'] = 'Als reiner Text anzeigen';
 $labels['changeformathtml'] = 'Als original HTML anzeigen';
-
-// message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
 $labels['send']           = 'Senden';
 $labels['sendmessage']    = 'Nachricht jetzt senden';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
 $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['highest'] = 'Höchste';
-
 $labels['nosubject']  = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Angezeigter Name';
 $labels['firstname']    = 'Vorname';
 $labels['surname']      = 'Nachname';
@@ -304,7 +262,6 @@ $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Detaillierte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
-
 $labels['typehome']   = 'Privat';
 $labels['typework']   = 'Dienstlich';
 $labels['typeother']  = 'Andere';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,34 @@ $labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
 $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['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Gruppenmitglieder auflisten';
 $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:';
-$labels['importtarget'] = 'Einen neuen Kontakt hinzufügen:';
+$labels['importtarget'] = 'Kontakte hinzufügen zu';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
+$labels['importgroupsexisting'] = 'Nur für existierende Gruppen';
 $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';
@@ -480,7 +426,6 @@ $labels['standardwindows'] = 'Popups als Standard Windows behandeln';
 $labels['forwardmode'] = 'Nachrichtenweiterleitung';
 $labels['inline'] = 'eingebettet';
 $labels['asattachment'] = 'als Anhang';
-
 $labels['folder']  = 'Ordner';
 $labels['folders']  = 'Ordner';
 $labels['foldername']  = 'Ordnername';
@@ -501,26 +446,20 @@ $labels['foldertype'] = 'Ordnertyp';
 $labels['personalfolder']  = 'Privater Ordner';
 $labels['otherfolder']  = 'Ordner eines anderen Benutzers';
 $labels['sharedfolder']  = 'Öffentlicher Ordner';
-
 $labels['sortby'] = 'Sortieren nach';
 $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';
@@ -539,5 +478,4 @@ $labels['vietnamese'] = 'Vietnamesisch';
 $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 7b6099924..fbc21521a 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden.';
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden.';
 $messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen.';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht.';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten.';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten.';
 $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger. Reduzieren Sie die Anzahl Empfängeradressen auf $max.';
 $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen es erneut.';
 $messages['contactdelerror'] = 'Fehler beim Löschen.';
 $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben.
 $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 $messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, weil sein Typ nicht dem in der Nachricht deklarierten Typ entspricht. Wenn Sie dem Sender nicht trauen, sollten Sie den Anhang nicht öffnen, weil er schadhaften Inhalte beinhalten könnte.<br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
 $messages['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 d3030e574..2e3ab405c 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Καλώς ήρθατε στο $product';
 $labels['username']  = 'Όνομα Χρήστη';
 $labels['password']  = 'Κωδικός Πρόσβασης';
 $labels['server']    = 'Εξυπηρετητής';
 $labels['login']     = 'Σύνδεση';
-
-// taskbar
 $labels['logout']   = 'Αποσύνδεση';
 $labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Ρυθμίσεις';
 $labels['addressbook'] = 'Επαφές';
-
-// mailbox names
 $labels['inbox']  = 'Εισερχόμενα';
 $labels['drafts'] = 'Πρόχειρα';
 $labels['sent']   = 'Απεσταλμένα';
 $labels['trash']  = 'Κάδος Απορριμάτων';
 $labels['junk']   = 'Ανεπιθύμητα';
 $labels['show_real_foldernames'] = 'Εμφάνιση πραγματικών ονομάτων για ειδικούς φακέλους';
-
-// message listing
 $labels['subject'] = 'Θέμα';
 $labels['from']    = 'Αποστολέας';
 $labels['sender']  = 'Αποστολέας';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Πρoτεραιότητα';
 $labels['organization'] = 'Οργανισμός';
 $labels['readstatus'] = 'Κατάσταση ανάγνωσης';
 $labels['listoptions'] = 'Κατάλογος επιλογών';
-
 $labels['mailboxlist'] = 'Φάκελοι';
 $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']   = 'Μετακίνηση σε...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Λήψη';
 $labels['open']     = 'Ανοιγμα';
 $labels['showattachment'] = 'Εμφάνιση';
 $labels['showanyway'] = 'Εμφάνιση';
-
 $labels['filename'] = 'Όνομα αρχείου';
 $labels['filesize'] = 'Μέγεθος αρχείου';
-
 $labels['addtoaddressbook'] = 'Προσθήκη στο βιβλίο διευθύνσεων';
-
-// weekdays short
 $labels['sun'] = 'Κυρ';
 $labels['mon'] = 'Δευτ';
 $labels['tue'] = 'Τρι';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Τετ';
 $labels['thu'] = 'Πεμπ';
 $labels['fri'] = 'Παρ';
 $labels['sat'] = 'Σαβ';
-
-// weekdays long
 $labels['sunday']    = 'Κυριακή';
 $labels['monday']    = 'Δευτέρα';
 $labels['tuesday']   = 'Τρίτη';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Τετάρτη';
 $labels['thursday']  = 'Πέμπτη';
 $labels['friday']    = 'Παρασκευή';
 $labels['saturday']  = 'Σάββατο';
-
-// months short
 $labels['jan']	= 'Ιαν';
 $labels['feb']	= 'Φεβ';
 $labels['mar']	= 'Μαρ';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Σεπ';
 $labels['oct']	= 'Οκτ';
 $labels['nov']	= 'Νοε';
 $labels['dec']	= 'Δεκ';
-
-// months long
 $labels['longjan']	= 'Ιανουάριος';
 $labels['longfeb']	= 'Φεβρουάριος';
 $labels['longmar']	= 'Μάρτιος';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Σεπτέμβριος';
 $labels['longoct']	= 'Οκτώβριος';
 $labels['longnov']	= 'Νοέμβριος';
 $labels['longdec']	= 'Δεκέμβριος';
-
 $labels['today'] = 'Σήμερα';
-
-// toolbar buttons
 $labels['refresh']          = 'Ανανέωση';
 $labels['checkmail']        = 'Έλεγχος για νέα μηνύματα';
 $labels['compose']          = 'Δημιουργία μηνύματος';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Περισσότερες ενέργειες...';
 $labels['more']             = 'Περισσότερα';
 $labels['back']             = 'Επιστροφή';
 $labels['options']          = 'Επιλογές';
-
 $labels['select'] = 'Επιλέξτε';
 $labels['all'] = 'Όλα';
 $labels['none'] = 'Κανένα';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Ανάπτυξη όλων';
 $labels['expand-unread'] = 'Ανάπτυξη των μη αναγνωσμένων';
 $labels['collapse-all'] = 'Σύμπτυξη όλων';
 $labels['threaded'] = 'Θεματοποιημένα';
-
 $labels['autoexpand_threads'] = 'Ανάπτυξη θεματοποιημένων μηνυμάτων';
 $labels['do_expand'] = 'όλα τα θέματα';
 $labels['expand_only_unread'] = 'μόνο με τα μη αναγνωσμένα μηνύματα';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'Στήλες';
 $labels['listsorting'] = 'Ταξινόμηση στηλών';
 $labels['listorder'] = 'Σειρά ταξινόμησης';
 $labels['listmode'] = 'Προβολή σε λίστα';
-
 $labels['folderactions'] = 'Ενέργειες στους φακέλους';
 $labels['compact'] = 'Συμπίεση';
 $labels['empty'] = 'Άδειασμα';
 $labels['importmessages'] = 'Εισαγωγή μηνυμάτων';
-
 $labels['quota'] = 'Χρήση δίσκου';
 $labels['unknown']  = 'άγνωστο';
 $labels['unlimited']  = 'απεριόριστο';
-
 $labels['quicksearch']  = 'Γρήγορη Αναζήτηση';
 $labels['resetsearch']  = 'Επαναφορά Αναζήτησης';
 $labels['searchmod']  = 'Aλλαγή αναζήτησης';
 $labels['msgtext']  = 'Σε όλο το μήνυμα';
 $labels['body']  = 'Σώμα';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Τυπος';
+$labels['namex'] = 'όνομα';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
 $labels['changeformattext'] = 'Εμφάνιση σε μορφή απλού κειμένου';
 $labels['changeformathtml'] = 'Εμφάνιση σε μορφή HTML';
-
-// message compose
 $labels['editasnew']      = 'Επεξεργασία σαν νέο';
 $labels['send']           = 'Αποστολή';
 $labels['sendmessage']    = 'Αποστολή μηνύματος';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'Αναφορά Παράδοσης';
 $labels['dsn']            = 'Κατάσταση αναφοράς παράδοσης';
 $labels['mailreplyintro'] = 'Στις $date, $sender έγραψε:';
 $labels['originalmessage'] = 'Αρχικό μήνυμα';
-
 $labels['editidents']    = 'Επεξεργασία ταυτοτήτων';
 $labels['spellcheck']    = 'Συλλαβισμός';
 $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
 $labels['resumeediting'] = 'Συνέχεια επεξεργασίας';
 $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['highest'] = 'Μέγιστη δυνατή';
-
 $labels['nosubject']  = '(χωρίς θέμα)';
 $labels['showimages'] = 'Προβολή εικόνων';
 $labels['alwaysshow'] = 'Να προβάλλονται πάντα οι εικόνες που αποστέλλονται από τον $sender';
@@ -251,25 +215,19 @@ $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'] = 'Σημείωση: Αυτή η αναφορά επιβεβαιώνει μόνο ότι το μήνυμά σας εμφανίστηκε στον υπολογιστή του παραλήπτη. Δεν επιβεβαιώνει ότι ο παραλήπτης έχει διαβάσει ή έχει κατανοήσει το περιεχόμενό του.';
-
-// address boook
 $labels['name']         = 'Εμφανιζόμενο όνομα';
 $labels['firstname']    = 'Όνομα';
 $labels['surname']      = 'Επώνυμο';
@@ -304,7 +262,6 @@ $labels['search'] = 'Αναζήτηση';
 $labels['advsearch'] = 'Προηγμένη Αναζήτηση';
 $labels['advanced'] = 'Προχωρημένες ρυθμίσεις';
 $labels['other'] = 'Άλλα';
-
 $labels['typehome']   = 'Οικία';
 $labels['typework']   = 'Εργασία';
 $labels['typeother']  = 'Άλλα';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = 'Υπάλληλος';
 $labels['typehomepage']  = 'Αρχική Σελίδα';
 $labels['typeblog'] = 'Ιστολόγιο';
 $labels['typeprofile'] = 'Προφίλ';
-
 $labels['addfield'] = 'Προσθήκη πεδίου...';
 $labels['addcontact'] = 'Προσθήκη νέας επαφής';
 $labels['editcontact'] = 'Επεξεργασία επαφής';
 $labels['contacts'] = 'Επαφές';
 $labels['contactproperties'] = 'Ιδιότητες επαφών';
 $labels['personalinfo'] = 'Προσωπικές πληροφορίες';
-
 $labels['edit']   = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
 $labels['save']   = 'Αποθήκευση';
@@ -335,7 +290,6 @@ $labels['rename'] = 'Μετονομασία';
 $labels['addphoto'] = 'Προσθήκη';
 $labels['replacephoto'] = 'Αντικατάσταση';
 $labels['uploadphoto'] = 'Φόρτωση εικόνας';
-
 $labels['newcontact']     = 'Δημιουργία νέας κάρτας επαφής';
 $labels['deletecontact']  = 'Διαγραφή επιλεγμένων επαφών';
 $labels['composeto']      = 'Σύνθεση μηνύματος προς';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Δημιουργία νέας Ομάδας επα�
 $labels['grouprename']    = 'Μετονομασία ομάδας';
 $labels['groupdelete']    = 'Διαγραφή ομάδας';
 $labels['groupremoveselected'] = 'Αφαίρεση επιλεγμένων επαφών από την ομάδα';
-
 $labels['previouspage']   = 'Εμφάνιση προηγούμενης σελίδας';
 $labels['firstpage']      = 'Εμφάνιση της πρώτης σελίδας';
 $labels['nextpage']       = 'Εμφάνιση επόμενης σελίδας';
 $labels['lastpage']       = 'Εμφάνιση της τελευταίας σελίδας';
-
 $labels['group'] = 'Ομάδα';
 $labels['groups'] = 'Ομάδες';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Μέλη της ομάδας λίστας';
 $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';
@@ -480,7 +424,6 @@ $labels['standardwindows'] = 'Χειριστείτε τα αναδυόμενα �
 $labels['forwardmode'] = 'Προώθηση μηνυμάτων';
 $labels['inline'] = 'με εσνωμάτωση';
 $labels['asattachment'] = 'σαν επισύναψη';
-
 $labels['folder']  = 'Φάκελος';
 $labels['folders']  = 'Φάκελοι';
 $labels['foldername']  = 'Όνομα φακέλου';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Τύπος φακέλου';
 $labels['personalfolder']  = 'Προσωπικός φάκελος';
 $labels['otherfolder']  = 'Φάκελοι άλλων χρηστών';
 $labels['sharedfolder']  = 'Κοινόχρηστος φάκελος';
-
 $labels['sortby'] = 'Ταξινόμηση κατά';
 $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'] = 'Δυτικής Ευρώπης';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Βιετναμέζικα';
 $labels['japanese'] = 'Ιαπωνικά';
 $labels['korean'] = 'Κορεατικά';
 $labels['chinese'] = 'Κινεζικά';
-
 ?>
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 504baa674..be6639d68 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Έχει προκύψει κάποιο σφάλμα!';
 $messages['loginfailed']  = 'Είσοδος απέτυχε';
 $messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Η ζητούμενη επαφή δεν βρέθ
 $messages['contactsearchonly'] = 'Εισάγετε κάποιους όρους προς αναζήτηση';
 $messages['sendingfailed'] = 'Αποστολή μηνύματος απέτυχε';
 $messages['senttooquickly'] = 'Παρακαλώ περιμένετε $sec δευτερόλεπτα, πριν στείλετε το μήνυμα';
-$messages['errorsavingsent'] = 'Παρουσιάστηκε σφάλμα, κατά την αποθήκευση του απεσταλμένου μηνύματος';
-$messages['errorsaving'] = 'Παρουσιάστηκε σφάλμα κατά την αποθήκευση';
 $messages['errormoving'] = 'Το μήνυμα δε μπορούσε να μετακινηθεί';
 $messages['errorcopying'] = 'Δεν είναι δυνατή η αντιγραφή του μηνύματος/των';
 $messages['errordeleting'] = 'Το μήνυμα δε μπορούσε να διαγραφεί';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Σφάλμα SMTP: $msg';
 $messages['emailformaterror'] = 'Λανθασμένη διεύθνση email: $email';
 $messages['toomanyrecipients'] = 'Μεγάλο πλήθος αποδεκτών. Μειώστε τον αριθμό των αποδεκτών σε $max.';
 $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών της ομάδας υπερβαίνει τον μέγιστο των $max μελών.';
-$messages['internalerror'] = 'Προέκυψε ένα εσωτερικό σφάλμα. Παρακαλώ δοκιμάστε πάλι.';
 $messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγράφηκαν με επιτυχία.';
 $messages['contactrestoreerror'] = 'Οι διαγραφημενη επαφη(ες) δεν μπορουν να επαναφερθουν.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Δεν είναι δυνατή η δημιου
 $messages['messagetoobig'] = 'Το τμήμα μήνυματος είναι πολύ μεγάλο για επεξεργασια. ';
 $messages['attachmentvalidationerror'] = 'ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Αυτή η κατάσχεση είναι ύποπτη, επειδή ο τύπος δεν ταιριάζει με τον τύπο που δηλώνεται στο μήνυμα. Εάν δεν εμπιστεύεστε τον αποστολέα, δεν θα πρέπει να το ανοίγετε στο πρόγραμμα περιήγησης επειδή μπορεί να περιέχει κακόβουλο περιεχόμενο.<br/><br/><em>Expected: $expected; found: $detected</em> ';
 $messages['noscriptwarning'] = 'Προειδοποίηση : Αυτή η υπηρεσία webmail απαιτεί Javascript! Για να ΤΟ χρησιμοποιήσετε ενεργοποιήστε τΟ JavaScript στις ρυθμίσεις του browser σας. ';
-
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index f903b0cf5..c7778e955 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Drafts';
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Deleted Items';
 $labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Subject';
 $labels['from']    = 'From';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'To';
 $labels['cc']      = 'Copy';
 $labels['bcc']     = 'Bcc';
@@ -54,27 +42,20 @@ $labels['priority'] = 'Priority';
 $labels['organization'] = 'Company';
 $labels['readstatus'] = 'Read status';
 $labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = '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['open']     = 'Open';
 $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';
@@ -82,8 +63,6 @@ $labels['wed'] = 'Wed';
 $labels['thu'] = 'Thu';
 $labels['fri'] = 'Fri';
 $labels['sat'] = 'Sat';
-
-// weekdays long
 $labels['sunday']    = 'Sunday';
 $labels['monday']    = 'Monday';
 $labels['tuesday']   = 'Tuesday';
@@ -91,8 +70,6 @@ $labels['wednesday'] = 'Wednesday';
 $labels['thursday']  = 'Thursday';
 $labels['friday']    = 'Friday';
 $labels['saturday']  = 'Saturday';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +82,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'January';
 $labels['longfeb']	= 'February';
 $labels['longmar']	= 'March';
@@ -119,10 +94,7 @@ $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';
@@ -155,7 +127,6 @@ $labels['moreactions']      = 'More actions...';
 $labels['more']             = 'More';
 $labels['back']             = 'Back';
 $labels['options']          = 'Options';
-
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
@@ -163,7 +134,6 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -174,7 +144,6 @@ $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';
@@ -190,29 +159,18 @@ $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['importmessages'] = 'Import messages';
-
 $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['type'] = 'Type';
-
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Edit as new';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send now';
@@ -224,26 +182,22 @@ $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';
@@ -251,25 +205,19 @@ $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';
@@ -304,7 +252,6 @@ $labels['search'] = 'Search';
 $labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'Advanced';
 $labels['other'] = 'Other';
-
 $labels['typehome']   = 'Home';
 $labels['typework']   = 'Work';
 $labels['typeother']  = 'Other';
@@ -319,14 +266,12 @@ $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';
@@ -335,61 +280,45 @@ $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 set';
 $labels['firstpage']      = 'Show first set';
 $labels['nextpage']       = 'Show next set';
 $labels['lastpage']       = 'Show last set';
-
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
 $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';
@@ -406,7 +335,6 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message only';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -476,11 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignore words with numbers';
 $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised';
 $labels['addtodict'] = 'Add to dictionary';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folders';
 $labels['foldername']  = 'Folder name';
@@ -501,26 +427,20 @@ $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'] = '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';
@@ -539,5 +459,4 @@ $labels['vietnamese'] = 'Vietnamese';
 $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 9509451ed..5b6a8f7f2 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -15,9 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$messages['errortitle']  = 'An error occurred.';
+$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.';
@@ -28,8 +26,6 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
@@ -56,8 +52,6 @@ $messages['contactnotfound'] = 'The requested contact was not found.';
 $messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Failed to send message.';
 $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occurred while saving sent message.';
-$messages['errorsaving'] = 'An error occurred 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).';
@@ -101,16 +95,11 @@ $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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'This address book 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['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Deleting message(s)...';
 $messages['markingmessage'] = 'Marking message(s)...';
 $messages['addingmember'] = 'Adding contact(s) to the group...';
@@ -129,8 +118,6 @@ $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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?';
@@ -144,7 +131,6 @@ $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect 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 occurred. Please try again.';
 $messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'Contact(s) deleted successfully.';
 $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'Unable to create/move folder into selected par
 $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 3c2930c89..0a55d36ae 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -15,34 +15,23 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Ricevitujo';
 $labels['drafts'] = 'Malnetujo';
 $labels['sent']   = 'Senditujo';
 $labels['trash']  = 'Rubujo';
 $labels['junk']   = 'Spamujo';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Temo';
 $labels['from']    = 'Sendanto';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Sendinto';
 $labels['to']      = 'Ricevanto';
 $labels['cc']      = 'Kopio';
 $labels['bcc']     = 'Blindkopio';
@@ -54,27 +43,20 @@ $labels['priority'] = 'Prioritato';
 $labels['organization'] = 'Organizo';
 $labels['readstatus'] = 'Legis statuson';
 $labels['listoptions'] = 'List-agordoj...';
-
 $labels['mailboxlist'] = '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['download'] = 'elŝutu';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
+$labels['showattachment'] = 'Montri';
+$labels['showanyway'] = 'Tamen montri ĝin';
 $labels['filename'] = 'Dosiernomo';
 $labels['filesize'] = 'Dosiergrando';
-
 $labels['addtoaddressbook'] = 'Aldonu al adresaro';
-
-// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -82,8 +64,6 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Ĵaŭ';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-
-// weekdays long
 $labels['sunday']    = 'Dimanĉo';
 $labels['monday']    = 'Lundo';
 $labels['tuesday']   = 'Mardo';
@@ -91,8 +71,6 @@ $labels['wednesday'] = 'Merkredo';
 $labels['thursday']  = 'Ĵaŭdo';
 $labels['friday']    = 'Vendredo';
 $labels['saturday']  = 'Sabato';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +83,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Januaro';
 $labels['longfeb']	= 'Februaro';
 $labels['longmar']	= 'Marto';
@@ -119,10 +95,7 @@ $labels['longsep']	= 'Septembro';
 $labels['longoct']	= 'Oktobro';
 $labels['longnov']	= 'Novembro';
 $labels['longdec']	= 'Decembro';
-
 $labels['today'] = 'Hodiaŭ';
-
-// toolbar buttons
 $labels['refresh']          = 'Aktualigi';
 $labels['checkmail']        = 'Kontroli por novaj mesaĝoj';
 $labels['compose']          = 'Verki';
@@ -155,7 +128,6 @@ $labels['moreactions']      = 'Pliaj agoj';
 $labels['more']             = 'Pli';
 $labels['back']             = 'Malantaŭen';
 $labels['options']          = 'Agordoj';
-
 $labels['select'] = 'Elektu';
 $labels['all'] = 'Ĉion';
 $labels['none'] = 'Nenion';
@@ -163,9 +135,8 @@ $labels['currpage'] = 'Nuna paĝo';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Forigita';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Ne forigita';
 $labels['invert'] = 'Inversigu';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listo';
@@ -174,7 +145,6 @@ $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';
@@ -189,32 +159,21 @@ $labels['desc'] = 'malkreskante';
 $labels['listcolumns'] = 'List-rubrikoj';
 $labels['listsorting'] = 'Ordig-rubriko';
 $labels['listorder'] = 'Ordig-ordo';
-$labels['listmode'] = 'List view mode';
-
+$labels['listmode'] = 'Lista vido';
 $labels['folderactions'] = 'Dosierujo-agoj';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
-$labels['importmessages'] = 'Import messages';
-
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Redaktu kiel nova';
-$labels['send']           = 'Send';
+$labels['send']           = 'Sendi';
 $labels['sendmessage']    = 'Sendu mesaĝon';
 $labels['savemessage']    = 'Savu ĉi tiun malneton';
 $labels['addattachment']  = 'Alfiksu dosieron';
@@ -224,52 +183,42 @@ $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['checkspelling'] = 'Kontrolu literumadon';
 $labels['resumeediting'] = 'Rekomencu redaktadon';
 $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['highest'] = 'Plej alta';
-
 $labels['nosubject']  = '(sen temo)';
 $labels['showimages'] = 'Montru bildojn';
 $labels['alwaysshow'] = 'Ĉiam montru bildojn de $sender';
 $labels['isdraft']    = 'Ĉi-mesaĝo estas malneto';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
-
+$labels['andnmore']   = '$nr pli';
+$labels['togglemoreheaders'] = 'Montri pli multajn mesaĝtitolojn';
+$labels['togglefullheaders'] = 'Maligi ĉu mesaĝaj titoloj nudu';
 $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.';
-
-// address boook
 $labels['name']         = 'Nomo';
 $labels['firstname']    = 'Antaŭnomo';
 $labels['surname']      = 'Familia nomo';
@@ -280,7 +229,7 @@ $labels['nickname']     = 'Kromnomo';
 $labels['jobtitle']     = 'Postena titolo';
 $labels['department']   = 'Departemento';
 $labels['gender']       = 'Sekso';
-$labels['maidenname']   = 'Maiden Name';
+$labels['maidenname']   = 'Fraŭla nomo';
 $labels['email']        = 'Retpoŝto';
 $labels['phone']        = 'Telefono';
 $labels['address']      = 'Adreso';
@@ -304,7 +253,6 @@ $labels['search'] = 'Serĉu';
 $labels['advsearch'] = 'Detala sercô';
 $labels['advanced'] = 'Altnivela';
 $labels['other'] = 'Alia';
-
 $labels['typehome']   = 'Hejmo';
 $labels['typework']   = 'Laboro';
 $labels['typeother']  = 'Alia';
@@ -314,19 +262,16 @@ $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['cancel'] = 'Nuligi';
 $labels['save']   = 'Konservi';
@@ -335,78 +280,38 @@ $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['contactsfromto'] = 'Kontaktoj ekde $from ĝis $to de $count';
 $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['listgroup'] = 'List group members';
 $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['autodetect']  = 'Auto';
 $labels['language']  = 'Lingvo';
 $labels['timezone']  = 'Tempzono';
 $labels['pagesize']  = 'Mesaĝoj po paĝo';
 $labels['signature'] = 'Subskribo';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Montru antaŭrigardejon';
 $labels['skin'] = 'Interfaco-etoso';
 $labels['logoutclear'] = 'Malplenigu rubujon je eliro';
@@ -417,70 +322,14 @@ $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['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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Dosierujo';
 $labels['folders']  = 'Dosierujoj';
 $labels['foldername']  = 'Dosierujo-nomo';
@@ -489,55 +338,7 @@ $labels['messagecount'] = 'Mesaĝoj';
 $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['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 a7765e442..17e3f1719 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Eraro okazis!';
 $messages['loginfailed']  = 'Malsukcesis ensaluti';
 $messages['cookiesdisabled'] = 'Via foliumilo ne akceptas kuketojn';
@@ -25,20 +23,13 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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...';
@@ -48,129 +39,43 @@ $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['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['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['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['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';
 $messages['fileuploaderror'] = 'Malsukcesis alŝuti dosieron';
 $messages['filesizeerror'] = 'La alŝutita dosiero superas la maksimuman grandon de $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 5bc53f7f0..eb4630ed4 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Papelera';
 $labels['junk']   = 'Basura';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
 $labels['sender']  = 'Remitente';
@@ -47,34 +36,25 @@ $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Fecha';
 $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
-$labels['readstatus'] = 'Read status';
 $labels['listoptions'] = 'Listar opciones...';
-
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = '$from a $to de $count conversaciones';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar esto siempre';
-
 $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';
@@ -82,8 +62,6 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-
-// weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Lunes';
 $labels['tuesday']   = 'Martes';
@@ -91,8 +69,6 @@ $labels['wednesday'] = 'Miércoles';
 $labels['thursday']  = 'Jueves';
 $labels['friday']    = 'Viernes';
 $labels['saturday']  = 'Sábado';
-
-// months short
 $labels['jan']	= 'Ene';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +81,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dic';
-
-// months long
 $labels['longjan']	= 'Enero';
 $labels['longfeb']	= 'Febrero';
 $labels['longmar']	= 'Marzo';
@@ -119,10 +93,7 @@ $labels['longsep']	= 'Septiembre';
 $labels['longoct']	= 'Octubre';
 $labels['longnov']	= 'Noviembre';
 $labels['longdec']	= 'Diciembre';
-
 $labels['today'] = 'Hoy';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Revisar si hay nuevos mensajes';
 $labels['compose']          = 'Escribir un mensaje';
@@ -155,7 +126,6 @@ $labels['moreactions']      = 'Mas acciones...';
 $labels['more']             = 'Más';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opciones';
-
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
@@ -163,7 +133,6 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
@@ -174,7 +143,6 @@ $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
 $labels['threaded'] = 'Como conversaciones';
-
 $labels['autoexpand_threads'] = 'Expandir mensajes en conversación';
 $labels['do_expand'] = 'todas las conversaciones';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
@@ -189,30 +157,18 @@ $labels['desc'] = 'Descendente';
 $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenado por';
-$labels['listmode'] = 'List view mode';
-
 $labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
-$labels['importmessages'] = 'Import messages';
-
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
@@ -224,52 +180,40 @@ $labels['returnreceipt']  = 'Acuse de recibo';
 $labels['dsn']            = 'Notificación de estado del envío';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
-
 $labels['editidents']    = 'Editar identidades';
 $labels['spellcheck']    = 'Gramática';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto']      = 'Revertir a';
-
 $labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
 $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['highest'] = 'Altísimo';
-
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
 $labels['isdraft']    = 'Este es un borrador.';
 $labels['andnmore']   = '$nr más...';
 $labels['togglemoreheaders'] = 'Mostrarme más encabezados de mensaje';
-$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.';
-
-// address boook
 $labels['name']         = 'Nombre completo';
 $labels['firstname']    = 'Nombre';
 $labels['surname']      = 'Apellido';
@@ -304,7 +248,6 @@ $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda Avanzada';
 $labels['advanced'] = 'Avanzado';
 $labels['other'] = 'Otro';
-
 $labels['typehome']   = 'Particular';
 $labels['typework']   = 'Laboral';
 $labels['typeother']  = 'Otro';
@@ -319,14 +262,12 @@ $labels['typeassistant']  = 'Asistente';
 $labels['typehomepage']  = 'Página Personal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
-
 $labels['addfield'] = 'Agregar 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['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -335,61 +276,45 @@ $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Agregar';
 $labels['replacephoto'] = 'Reemplazar';
 $labels['uploadphoto'] = 'Subir foto';
-
 $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['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
 $labels['grouprename']    = 'Renombrar grupo';
 $labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Remover del grupo los contactos seleccionados';
-
 $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['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Direcciones personales';
-
 $labels['searchsave'] = 'Guardar búsqueda';
 $labels['searchdelete'] = 'Eliminar búsqueda';
-
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
-$labels['importtarget'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
 $labels['importdesc'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importación de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $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['htmlmessage'] = 'Mensaje HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
@@ -406,7 +331,6 @@ $labels['htmleditor'] = 'Componer mensaje en HTML';
 $labels['htmlonreply'] = 'al responder un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -417,21 +341,17 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
@@ -445,15 +365,12 @@ $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';
@@ -463,24 +380,6 @@ $labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
 $labels['insertsignature'] = 'Insertar firma';
 $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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Carpeta';
 $labels['folders']  = 'Carpetas';
 $labels['foldername']  = 'Nombre de carpeta';
@@ -490,37 +389,13 @@ $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['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';
@@ -539,5 +414,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 1a0240222..1c442c189 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -15,8 +15,6 @@
 
  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';
@@ -28,8 +26,6 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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';
@@ -56,8 +52,6 @@ $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';
-$messages['errorsaving'] = 'Ocurrió un error al guardar';
 $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';
@@ -101,16 +95,11 @@ $messages['converting'] = 'Removiendo 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 maximo ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Eliminando contacto(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
 $messages['addingmember'] = 'Agregando contacto(s) al grupo...';
@@ -129,8 +118,6 @@ $messages['importwait'] = 'Importando, aguarde por favor...';
 $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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?';
@@ -144,7 +131,6 @@ $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).';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'No se pudo crear/mover la carpeta dentro de la
 $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 11d14fa08..66fcafd0b 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Papelera';
 $labels['junk']   = 'SPAM';
 $labels['show_real_foldernames'] = 'Mostrar nombres reales para carpetas especiales';
-
-// message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
 $labels['sender']  = 'Remitente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Leer estado';
 $labels['listoptions'] = 'Lista de opciones...';
-
 $labels['mailboxlist'] = '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…';
@@ -68,13 +56,9 @@ $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-
-// weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Lunes';
 $labels['tuesday']   = 'Martes';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Miércoles';
 $labels['thursday']  = 'Jueves';
 $labels['friday']    = 'Viernes';
 $labels['saturday']  = 'Sábado';
-
-// months short
 $labels['jan']	= 'Ene';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dic';
-
-// months long
 $labels['longjan']	= 'Enero';
 $labels['longfeb']	= 'Febrero';
 $labels['longmar']	= 'Marzo';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Septiembre';
 $labels['longoct']	= 'Octubre';
 $labels['longnov']	= 'Noviembre';
 $labels['longdec']	= 'Diciembre';
-
 $labels['today'] = 'Hoy';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Revisar si hay mensajes nuevos';
 $labels['compose']          = 'Redactar';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Más acciones…';
 $labels['more']             = 'Más';
 $labels['back']             = 'Volver';
 $labels['options']          = 'Opciones';
-
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Importar mensajes';
-
 $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['body']  = 'Cuerpo';
 $labels['type'] = 'Tipo';
-
+$labels['namex'] = 'Nombre';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
 $labels['changeformathtml'] = 'Mostrar en formato HTML';
-
-// message compose
 $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $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['highest'] = 'Altísimo';
-
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Nombre para mostrar';
 $labels['firstname']    = 'Nombre';
 $labels['surname']      = 'Apellido';
@@ -304,7 +262,6 @@ $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda avanzada';
 $labels['advanced'] = 'Avanzadas';
 $labels['other'] = 'Otro';
-
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Trabajo';
 $labels['typeother']  = 'Otro';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
 $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['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Listar miembros del grupo';
 $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['importtarget'] = 'Agregar contactos a';
 $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
+$labels['importgroups'] = 'Importar asignaciones de grupo';
+$labels['importgroupsall'] = 'Todos (crear grupos si es necesario)';
+$labels['importgroupsexisting'] = 'Sólo para los grupos existentes';
 $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 predeterminado';
 $labels['htmlmessage'] = 'Mensaje HTML';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Gestionar ventanas emergentes como ventanas están
 $labels['forwardmode'] = 'Reenvío de mensajes';
 $labels['inline'] = 'en línea';
 $labels['asattachment'] = 'como adjunto';
-
 $labels['folder']  = 'Bandeja';
 $labels['folders']  = 'Carpetas';
 $labels['foldername']  = 'Nombre de bandeja';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Tipo de bandeja';
 $labels['personalfolder']  = 'Bandeja privada';
 $labels['otherfolder']  = 'Bandeja de otro usuario';
 $labels['sharedfolder']  = 'Bandeja pública';
-
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
 $labels['undo'] = 'Deshacer';
-
 $labels['installedplugins'] = 'Complementos instalados';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 d4bd81402..3a8b5ab31 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -15,8 +15,6 @@
 
  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.';
@@ -56,8 +54,6 @@ $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/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).';
@@ -101,13 +97,16 @@ $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['copysuccess'] = '$nr contactos copiados correctamente.';
+$messages['movesuccess'] = '$nr contactos movidos correctamente.';
+$messages['copyerror'] = 'No se ha podido copiar ningún contacto.';
+$messages['moveerror'] = 'No se ha podido mover ningún contacto.';
 $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['movingcontact'] = 'Moviendo contacto(s)...';
 $messages['deletingmessage'] = 'Eliminando mensaje(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
 $messages['addingmember'] = 'Añadiendo contacto(s) al grupo…';
@@ -141,7 +140,6 @@ $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é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.';
@@ -169,5 +167,4 @@ $messages['parentnotwritable'] = 'No se puede crear/mover la carpeta a la carpet
 $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 a8bc28403..42a268dd2 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Saabuvad';
 $labels['drafts'] = 'Mustandid';
 $labels['sent']   = 'Saadetud';
 $labels['trash']  = 'Prügikast';
 $labels['junk']   = 'Rämps';
 $labels['show_real_foldernames'] = 'Näita eriliste kaustade päris nimesid';
-
-// message listing
 $labels['subject'] = 'Pealkiri';
 $labels['from']    = 'Saatja';
 $labels['sender']  = 'Saatja';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Tähtsus';
 $labels['organization'] = 'Organisatsioon';
 $labels['readstatus'] = 'Lugemise staatus';
 $labels['listoptions'] = 'Nimekirja valikud…';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'laadi arvutisse';
 $labels['open']     = 'Ava';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'K';
 $labels['thu'] = 'N';
 $labels['fri'] = 'R';
 $labels['sat'] = 'L';
-
-// weekdays long
 $labels['sunday']    = 'Pühapäev';
 $labels['monday']    = 'Esmaspäev';
 $labels['tuesday']   = 'Teisipäev';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Kolmapäev';
 $labels['thursday']  = 'Neljapäev';
 $labels['friday']    = 'Reede';
 $labels['saturday']  = 'Laupäev';
-
-// months short
 $labels['jan']	= 'jaan';
 $labels['feb']	= 'veebr';
 $labels['mar']	= 'märts';
@@ -105,8 +85,6 @@ $labels['sep']	= 'sept';
 $labels['oct']	= 'okt';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'dets';
-
-// months long
 $labels['longjan']	= 'Jaanuar';
 $labels['longfeb']	= 'Veebruar';
 $labels['longmar']	= 'Märts';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktoober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Detsember';
-
 $labels['today'] = 'Täna';
-
-// toolbar buttons
 $labels['refresh']          = 'Värskenda';
 $labels['checkmail']        = 'Kontrolli uusi kirju';
 $labels['compose']          = 'Koosta kiri';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Muud toimingud...';
 $labels['more']             = 'Rohkem';
 $labels['back']             = 'Tagasi';
 $labels['options']          = 'Valikud';
-
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'Puudub';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Impordi kirju';
-
 $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['body']  = 'Keha';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Tüüp';
+$labels['namex'] = 'Nimi';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
 $labels['changeformattext'] = 'Näita lihttekstina';
 $labels['changeformathtml'] = 'Näita HTMLis';
-
-// message compose
 $labels['editasnew']      = 'Kasuta uue kirja põhjana';
 $labels['send']           = 'Saada';
 $labels['sendmessage']    = 'Saada kiri kohe';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
 $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['highest'] = 'Kõrgeim';
-
 $labels['nosubject']  = '(teema puudub)';
 $labels['showimages'] = 'Näita pilte';
 $labels['alwaysshow'] = 'Näita alati $sender saadetud pilte';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Näidatav nimi';
 $labels['firstname']    = 'Eesnimi';
 $labels['surname']      = 'Perekonnanimi';
@@ -304,7 +262,6 @@ $labels['search'] = 'Otsi';
 $labels['advsearch'] = 'Täpsem otsing';
 $labels['advanced'] = 'Edasijõudnutele';
 $labels['other'] = 'Muu';
-
 $labels['typehome']   = 'Kodu';
 $labels['typework']   = 'Töö';
 $labels['typeother']  = 'Muu';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Katkesta';
 $labels['save']   = 'Salvesta';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Loo uus kontaktigrupp';
 $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['group'] = 'Grupp';
 $labels['groups'] = 'Grupid';
 $labels['listgroup'] = 'Näita grupi liikmeid';
 $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';
@@ -480,7 +424,6 @@ $labels['standardwindows'] = 'Käsitle hüpikaknaid tavaliste akendena';
 $labels['forwardmode'] = 'Kirja edastamine';
 $labels['inline'] = 'kirja sees';
 $labels['asattachment'] = 'manusena';
-
 $labels['folder']  = 'Kaust';
 $labels['folders']  = 'Kaustad';
 $labels['foldername']  = 'Kausta nimi';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Kausta tüüp';
 $labels['personalfolder']  = 'Isiklik kaust';
 $labels['otherfolder']  = 'Teiste kasutajate kaust';
 $labels['sharedfolder']  = 'Avalik kaust';
-
 $labels['sortby'] = 'Järjesta';
 $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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'vietnami';
 $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 4d58b0a75..0d2c79b5a 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Sinu veebilehitseja ei võta präänikuid vastu';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Otsitud kontakti ei leitud';
 $messages['contactsearchonly'] = 'Sisesta otsingusõna kontaktide leidmiseks';
 $messages['sendingfailed'] = 'Kirja saatmine ebaõnnestus';
 $messages['senttooquickly'] = 'Palun oota enne selle kirja saatmist $sec sekundit.';
-$messages['errorsavingsent'] = 'Saadetud kirja salvestamisel ilmnes tõrge';
-$messages['errorsaving'] = 'Salvestamise ajal ilmnes viga';
 $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
 $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
@@ -101,13 +97,16 @@ $messages['converting'] = 'Eemaldan kirjast vormindust...';
 $messages['messageopenerror'] = 'Kirjade serverist laadimine ebaõnnestus';
 $messages['fileuploaderror'] = 'Faili üleslaadimine ebaõnnestus';
 $messages['filesizeerror'] = 'Üleslaetava faili suurus ületab maksimaalse suuruse $size';
-$messages['copysuccess'] = '$nr aadressi edukalt kopeeritud';
-$messages['copyerror'] = 'Ühegi aadressi kopeerimine ei õnnestunud';
+$messages['copysuccess'] = '$nr kontakti edukalt kopeeritud.';
+$messages['movesuccess'] = '$nr kontakti edukalt liigutatud.';
+$messages['copyerror'] = 'Ühegi kontakti kopeerimine ei õnnestunud.';
+$messages['moveerror'] = 'Ühegi kontakti liigutamine ei õnnestunud.';
 $messages['sourceisreadonly'] = 'Aadressi asukohas puuduvad kirjutusõigused';
 $messages['errorsavingcontact'] = 'Kontakti aadressi salvestamine ebaõnnestus';
 $messages['movingmessage'] = 'Liigutan kirja...';
 $messages['copyingmessage'] = 'Kopeerin kirja...';
 $messages['copyingcontact'] = 'Kontakti(de) kopeerimine…';
+$messages['movingcontact'] = 'Kontakti(de) liigutamine…';
 $messages['deletingmessage'] = 'Kustutan kirja...';
 $messages['markingmessage'] = 'Märgin kirja...';
 $messages['addingmember'] = 'Kontakti(de) gruppi lisamine…';
@@ -141,7 +140,6 @@ $messages['smtperror'] = 'SMTP tõrge: $msg';
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
 $messages['toomanyrecipients'] = 'Liiga palju adressaate. Vähenda kirja saajate hulka $max-ni.';
 $messages['maxgroupmembersreached'] = 'Grupi liikmete arv ületab suurima lubatud $max';
-$messages['internalerror'] = 'Ilmnes sisemine tõrge. Palun proovi uuesti.';
 $messages['contactdelerror'] = 'Kontaktide kustutamine nurjus';
 $messages['contactdeleted'] = 'Kontaktide kustutamine õnnestus';
 $messages['contactrestoreerror'] = 'Kustutatud kontakti(de) taastamine nurjus.';
@@ -169,5 +167,4 @@ $messages['parentnotwritable'] = 'Kasuta loomine/liigutamine valitud kausta nurj
 $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 fedce7de5..bbfd0c6ac 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Sarrera';
 $labels['drafts'] = 'Zirriborroak';
 $labels['sent']   = 'Bidalitakoak';
 $labels['trash']  = 'Zakarrontzia';
 $labels['junk']   = 'Zabor-posta';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Erakutsi karpeta berezien benetako izenak';
 $labels['subject'] = 'Gaia';
 $labels['from']    = 'Nork';
 $labels['sender']  = 'Igorlea';
@@ -54,27 +44,21 @@ $labels['priority'] = 'Lehentasuna';
 $labels['organization'] = 'Erakundea';
 $labels['readstatus'] = 'Irakurketaren egoera';
 $labels['listoptions'] = 'Zerrendaren aukerak...';
-
 $labels['mailboxlist'] = '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['download'] = 'deskargatu';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
+$labels['open']     = 'Ireki';
+$labels['showattachment'] = 'Erakutsi';
+$labels['showanyway'] = 'Erakutsi edonola';
 $labels['filename'] = 'Fitxategi Izena';
 $labels['filesize'] = 'Fitxategi Tamaina';
-
 $labels['addtoaddressbook'] = 'Helbide liburura gehitu';
-
-// weekdays short
 $labels['sun'] = 'Iga';
 $labels['mon'] = 'Al';
 $labels['tue'] = 'As';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Azt';
 $labels['thu'] = 'Og';
 $labels['fri'] = 'Or';
 $labels['sat'] = 'Lar';
-
-// weekdays long
 $labels['sunday']    = 'Igandea';
 $labels['monday']    = 'Astelehena';
 $labels['tuesday']   = 'Asteartea';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Asteazkena';
 $labels['thursday']  = 'Osteguna';
 $labels['friday']    = 'Ostirala';
 $labels['saturday']  = 'Larunbata';
-
-// months short
 $labels['jan']	= 'Urt';
 $labels['feb']	= 'Ots';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Ira';
 $labels['oct']	= 'Urr';
 $labels['nov']	= 'Aza';
 $labels['dec']	= 'Abe';
-
-// months long
 $labels['longjan']	= 'Urtarrila';
 $labels['longfeb']	= 'Otsaila';
 $labels['longmar']	= 'Martxoa';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Iraila';
 $labels['longoct']	= 'Urria';
 $labels['longnov']	= 'Azaroa';
 $labels['longdec']	= 'Abendua';
-
 $labels['today'] = 'Gaur';
-
-// toolbar buttons
 $labels['refresh']          = 'Eguneratu';
 $labels['checkmail']        = 'Mezu berrien bila arakatu';
 $labels['compose']          = 'Mezu bat sortu';
@@ -133,7 +108,7 @@ $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
 $labels['replyall']         = 'Guztiei erantzun';
 $labels['replylist']        = 'Erantzun zerrenda';
 $labels['forward']          = 'Berbidali';
-$labels['forwardinline']    = 'Forward inline';
+$labels['forwardinline']    = 'Aurrera barnean';
 $labels['forwardattachment'] = 'Erantsi gisa berbidali';
 $labels['forwardmessage']   = 'Mezua Birbidali';
 $labels['deletemessage']    = 'Mezua ezabatu';
@@ -155,332 +130,301 @@ $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['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
+$labels['unanswered'] = 'Erantzun gabea';
+$labels['withattachment'] = 'Eranskinarekin';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
-$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['invert'] = 'Alderantzizkatu';
+$labels['filter'] = 'Iragazkia';
+$labels['list'] = 'Zerrenda';
+$labels['threads'] = 'Hariak';
+$labels['expand-all'] = 'Irekin denak';
+$labels['expand-unread'] = 'Ireki irakurri gabeak';
+$labels['collapse-all'] = 'Tolestu guztiak';
+$labels['threaded'] = 'Harian';
+$labels['autoexpand_threads'] = 'Irekin mezu-hariak';
+$labels['do_expand'] = 'hari guztiak';
+$labels['expand_only_unread'] = 'soilik irakurri gabeko mezuak dutenak';
 $labels['fromto'] = 'Nork/Nori';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
+$labels['flag'] = 'Bandera';
+$labels['attachment'] = 'Eranskina';
 $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['sentdate'] = 'Bidalketa-data';
+$labels['arrival'] = 'Jasotze-data';
+$labels['asc'] = 'gora';
+$labels['desc'] = 'behera';
+$labels['listcolumns'] = 'Zerrenda-zutabeak';
+$labels['listsorting'] = 'Zutabea ordenatzen';
+$labels['listorder'] = 'Ordenatze era';
+$labels['listmode'] = 'Zerrenda ikuspegia';
+$labels['folderactions'] = 'Karpeta-ekintzak...';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
-$labels['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Inportatu mezuak';
 $labels['quota'] = 'Disko erabilera';
 $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['type'] = 'Type';
-
+$labels['searchmod']  = 'Bilatu modifikadoreak';
+$labels['msgtext']  = 'Mezu osoa';
+$labels['body']  = 'Gorputza';
+$labels['type'] = 'Mota';
+$labels['namex'] = 'Izena';
 $labels['openinextwin'] = 'Lehio berrian ireki';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
+$labels['emlsave'] = 'Deskargatu (.eml)';
+$labels['changeformattext'] = 'Bistaratu testua formaturik gabe';
+$labels['changeformathtml'] = 'Bistaratu HTML formatuan';
+$labels['editasnew']      = 'Editatu berri bezala';
+$labels['send']           = 'Bidali';
 $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['returnreceipt']  = 'Bidali jasotze-agiria';
+$labels['dsn']            = 'Entrega-egoeraren jakinarazpena';
+$labels['mailreplyintro'] = '$date egunean, $sender-(e)k idatzi du:';
 $labels['originalmessage'] = 'Jatorrizko mezua';
-
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
+$labels['editidents']    = 'Editatu identitateak';
+$labels['spellcheck']    = 'Ortografia-egiaztatu';
 $labels['checkspelling'] = 'Egiaztaketa ortografikoa';
 $labels['resumeediting'] = 'Editatzen jarraitu';
 $labels['revertto']      = 'Itzuli hona';
-
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Erantsi';
 $labels['attachments'] = 'Eranskinak';
 $labels['upload'] = 'Igo';
-$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['uploadprogress'] = '$percent ($current/$total)';
 $labels['close']  = 'Itxi';
-$labels['messageoptions']  = 'Message options...';
-
+$labels['messageoptions']  = 'Mezu-aukerak';
 $labels['low']     = 'Baxua';
 $labels['lowest']  = 'Baxuena';
 $labels['normal']  = 'Normala';
 $labels['high']    = 'Altua';
 $labels['highest'] = 'Altuena';
-
 $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['isdraft']    = 'Hau zirriborro bat da';
+$labels['andnmore']   = '$nr gehiago...';
+$labels['togglemoreheaders'] = 'Erakutsi mezu mezu-goiburu gehiago';
+$labels['togglefullheaders'] = 'Aldatu mezu gordinen goiburuak';
 $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['maxuploadsize'] = 'Baimendutako gehienezko fitxategi tamaina: $size';
 $labels['addcc'] = 'Gehitu Cc (kopia)';
 $labels['addbcc'] = 'Gehitu Bcc (kopia ezkutua)';
 $labels['addreplyto'] = 'Gehitu erantzun-honi';
-$labels['addfollowupto'] = 'Add Followup-To';
-
-// mdn
+$labels['addfollowupto'] = 'Gehitu Jarraitu honi';
 $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:';
-
-// address boook
+$labels['receiptread'] = 'Bidali jasotze-agiria (irakurria)';
+$labels['yourmessage'] = 'Hau zure mezuaren jasotze-agiria da';
+$labels['receiptnote'] = 'Oharra:  jasotze-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['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
+$labels['middlename']   = 'Izenaren bigarren partea';
+$labels['nameprefix']   = 'Aurrizkia';
+$labels['namesuffix']   = 'Atzizkia';
 $labels['nickname']     = 'Ezizena';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
+$labels['jobtitle']     = 'Lanpostua ';
+$labels['department']   = 'Departamentoa';
+$labels['gender']       = 'Generoa';
+$labels['maidenname']   = 'Ezkondu aurreko izena';
 $labels['email']        = 'ePosta';
-$labels['phone']        = 'Phone';
+$labels['phone']        = 'Telefonoa';
 $labels['address']      = 'Helbidea';
 $labels['street']       = 'Kalea';
-$labels['locality']     = 'City';
+$labels['locality']     = 'Herria';
 $labels['zipcode']      = 'Posta kodea';
-$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['region']       = 'Estatua/Probintzia';
+$labels['country']      = 'Herrialdea';
+$labels['birthday']     = 'Urtebetetze-eguna';
+$labels['anniversary']  = 'Urteurren-eguna';
+$labels['website']      = 'Webgunea';
+$labels['instantmessenger'] = 'Txata';
+$labels['notes'] = 'Oharrak';
+$labels['male']   = 'gizon';
+$labels['female'] = 'emakume';
+$labels['manager'] = 'Kudeatzailea';
+$labels['assistant'] = 'Laguntzailea';
+$labels['spouse'] = 'Ezkontidea';
+$labels['allfields'] = 'Eremu guztiak';
+$labels['search'] = 'Bilatu';
+$labels['advsearch'] = 'Bilaketa aurreratua';
+$labels['advanced'] = 'Aurreratua';
+$labels['other'] = 'Beste';
+$labels['typehome']   = 'Etxekoa';
+$labels['typework']   = 'Lanekoa';
+$labels['typeother']  = 'Beste';
 $labels['typemobile']  = 'Mugikorra';
-$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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
+$labels['typemain']  = 'Nagusia';
+$labels['typehomefax']  = 'Etxeko faxa';
+$labels['typeworkfax']  = 'Laneko faxa';
+$labels['typecar']  = 'Autoa';
+$labels['typepager']  = 'Bilagailua';
+$labels['typevideo']  = 'Bideo';
+$labels['typeassistant']  = 'Laguntzailea';
+$labels['typehomepage']  = 'Etxeko orria';
+$labels['typeblog'] = 'Bloga';
+$labels['typeprofile'] = 'Profila';
+$labels['addfield'] = 'Gehitu eremua...';
+$labels['addcontact'] = 'Gehitu kontaktu berria';
+$labels['editcontact'] = 'Editatu kontaktua';
+$labels['contacts'] = 'Kontaktuak';
+$labels['contactproperties'] = 'Kontaktuen ezaugarriak';
 $labels['personalinfo'] = 'Informazio pertsonala';
-
 $labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
 $labels['save']   = 'Gorde';
 $labels['delete'] = 'Ezabatu';
-$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['rename'] = 'Berrizendatu';
+$labels['addphoto'] = 'Gehitu';
+$labels['replacephoto'] = 'Ordeztu';
+$labels['uploadphoto'] = 'Kargatu argazkia';
+$labels['newcontact']     = 'Sortu kontaktu-txartel berria';
+$labels['deletecontact']  = 'Ezabatu hautatutako kontaktuak';
+$labels['composeto']      = 'Idatzi mezua honi:';
+$labels['contactsfromto'] = '$from -tik $to -ra $count kontaktuak';
 $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['exportall']      = 'Esportatu dena';
+$labels['exportsel']      = 'Esportatu hautaketa';
+$labels['exportvcards']   = 'Esportatu kontaktuak vCard formatuan';
+$labels['newcontactgroup'] = 'Sortu kontaktu-talde berria';
+$labels['grouprename']    = 'Berrizendatu taldea';
+$labels['groupdelete']    = 'Ezabatu taldea';
+$labels['groupremoveselected'] = 'Ezabatu taldetik hautatutako kontaktuak';
+$labels['previouspage']   = 'Aurreko orria ikusi';
+$labels['firstpage']      = 'Lehenengo orria ikusi';
+$labels['nextpage']       = 'Hurrengo orria ikusi';
+$labels['lastpage']       = 'Azken orria ikusi';
+$labels['group'] = 'Taldea';
 $labels['groups'] = 'Taldeak';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Zerrendatu taldeko partaideak';
 $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['searchsave'] = 'Gorde bilaketa';
+$labels['searchdelete'] = 'Ezabatu bilaketa';
+$labels['import'] = 'Inportatu';
+$labels['importcontacts'] = 'Inportatu kontaktoak';
+$labels['importfromfile'] = 'Inportatu fitxategi honetatik:';
+$labels['importreplace'] = 'Ordezkatu helbide-liburu osoa';
+$labels['importdesc'] = 'Gehitzen ahal duzu kontaktuak dagoen helbide-liburu batetik.<br/>Inportatzeko onartzen diren formatuak:  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eta CSV (komaz banandutakoak).';
+$labels['done'] = 'Egina';
 $labels['settingsfor'] = 'Honen ezarpenak:';
-$labels['about'] = 'About';
+$labels['about'] = 'Honi buruz';
 $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['defaultcharset'] = 'Lehenetsitako karaktere-jokoa';
+$labels['htmlmessage'] = 'HTML mezua';
+$labels['messagepart'] = 'Zatia';
+$labels['digitalsig'] = 'Sinadura digitala';
+$labels['dateformat'] = 'Data-formatua';
+$labels['timeformat'] = 'Ordu-formatua';
 $labels['prettydate'] = 'Data politak';
 $labels['setdefault']  = 'Lehenespenak ezarri';
-$labels['autodetect']  = 'Auto';
+$labels['autodetect']  = 'Automatikoa';
 $labels['language']  = 'Hizkuntza';
 $labels['timezone']  = 'Ordu zonaldea';
 $labels['pagesize']  = 'Lerro orrialdeko';
 $labels['signature'] = 'Sinadura';
 $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['showinextwin'] = 'Ireki mezua leiho berrian';
+$labels['composeextwin'] = 'Idatzi leiho berrian';
+$labels['htmleditor'] = 'Idatzi HTML mezuak';
+$labels['htmlonreply'] = 'HTML mezua erantzuteko';
+$labels['htmlonreplyandforward'] = 'HTML mezua erantzuteko edo birbidaltzeko';
 $labels['htmlsignature'] = 'HTML sinadura';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Erakutsi helbide elektronikoak bere pantaila izenarekin';
 $labels['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
 $labels['logoutclear'] = 'Garbitu Zakarronzia irtetean';
 $labels['logoutcompact'] = 'Trinkotu Sarrera irtetean';
 $labels['uisettings'] = 'Erabiltzaile-interfazea';
 $labels['serversettings'] = 'Zerbitzariaren ezarpenak';
-$labels['mailboxview'] = 'Postakutxatilaren ikuspegia';
+$labels['mailboxview'] = 'Posta-kutxatila 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['autosend'] = 'bidali jasotze-agiria';
+$labels['autosendknown'] = 'bidali jasotze-agiria nire kontaktuei, bestela galdetu niri';
+$labels['autosendknownignore'] = 'bidali jasotze-agiria nire kontaktuei, bestela ez ikusi egin';
+$labels['ignore'] = 'ez ikusi';
 $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['skipdeleted'] = 'Ez erakutsi ezabatutako mezuak';
+$labels['deletealways'] = 'Zakarrontzira bidaltzeak huts egiten badu, ezabatu';
+$labels['deletejunk'] = 'Ezabatu zuzenean 
+zabor-mezuak';
+$labels['showremoteimages'] = 'Erakutsi konektatutako urrutiko irudiak';
+$labels['fromknownsenders'] = 'bidaltzaile ezagunengandik';
+$labels['always'] = 'beti';
 $labels['showinlineimages'] = 'Erakutsi erantzitako irudiak mezuaren azpian';
 $labels['autosavedraft']  = 'Zirriborroa automatikoki gorde';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['everynminutes']  = '$n minuturo';
+$labels['refreshinterval']  = 'Freskatu (bilatu mezu berriak eta abar)';
 $labels['never']  = 'inoiz ez';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Mezuak ikusi';
-$labels['messagescomposition'] = 'Mezuak sortu';
-$labels['mimeparamfolding'] = 'Attachment names';
+$labels['immediately']  = 'berehala';
+$labels['messagesdisplaying'] = 'Mezuak bistaratzen';
+$labels['messagescomposition'] = 'Mezuak idazten';
+$labels['mimeparamfolding'] = 'Eranskinen izenak';
 $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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
+$labels['2047folding'] = 'Full RFC 2047 (beste batzuk)';
+$labels['force7bit'] = 'Erabili MIME kodeketa 8 bitekok karakterentzat';
+$labels['advancedoptions'] = 'Aukera aurreratuak';
+$labels['focusonnewmessage'] = 'Fokatu leihoa mezu berrian';
+$labels['checkallfolders'] = 'Egiaztatu karpeta guztiak mezu berrien bila';
+$labels['displaynext'] = 'Mezu bat ezabatu/mugitzean erakutsi hurrengo mezua';
+$labels['defaultfont'] = 'Lehenetsitako letra-mota HTML mezuetarako';
+$labels['mainoptions'] = 'Aukera nagusiak';
+$labels['browseroptions'] = 'Nabigatze-aukerak';
+$labels['section'] = 'Atala';
+$labels['maintenance'] = 'Mantenua';
+$labels['newmessage'] = 'Mezu berria';
+$labels['signatureoptions'] = 'Sinadura-aukerak';
+$labels['whenreplying'] = 'Erantzutean';
+$labels['replyempty'] = 'ez aipatu jatorrizko mezua';
+$labels['replytopposting'] = 'hasi mezu berria aipamenaren gainean';
+$labels['replybottomposting'] = 'hasi mezu berria aipamenaren azpian';
+$labels['replyremovesignature'] = 'Erantzutean ezabatu mezuaren jatorrizko sinadura';
+$labels['autoaddsignature'] = 'Gehitu sinadura automatikoki';
+$labels['newmessageonly'] = 'bakarrik mezu berria';
+$labels['replyandforwardonly'] = 'bakarri erantzun eta birbidalketak';
+$labels['insertsignature'] = 'Txertatu sinadura';
+$labels['previewpanemarkread']  = 'Markatu ikusitako mezuak irakurrita bezala';
+$labels['afternseconds']  = '$n segundo eta gero';
+$labels['reqmdn'] = 'Eskatu beti jasotze-agiria';
+$labels['reqdsn'] = 'Eskatu beti entrega-egoeraren jakinarazpena';
+$labels['replysamefolder'] = 'Kokatu erantzunak erantzuten ari den mezuarenkarpeta berean';
+$labels['defaultabook'] = 'Lehenetsitako helbide-liburua';
+$labels['autocompletesingle'] = 'Saltatu helbide elektroniko alternatiboak  osatze automatikoan';
+$labels['listnamedisplay'] = 'Zerrendatu kontaktuak honela';
+$labels['spellcheckbeforesend'] = 'Egiaztatu ortografia mezua bidali aurretik';
+$labels['spellcheckoptions'] = 'Ortografia-egiaztatzearen aukerak';
+$labels['spellcheckignoresyms'] = 'Ez ikusi sinboloak dituzten hitzak';
+$labels['spellcheckignorenums'] = 'Ez ikusi zenbakiak dituzten hitzak';
+$labels['spellcheckignorecaps'] = 'Ez ikusi letra kapitalak dituzten hitzak';
+$labels['addtodict'] = 'Gehitu hiztegira';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto:  estekak';
+$labels['standardwindows'] = 'Tratatu laster-leihoak leiho estandar bezala';
+$labels['forwardmode'] = 'Mezuak birbidaltzen';
+$labels['inline'] = 'Konektatua';
+$labels['asattachment'] = 'eranskin moduan';
 $labels['folder']  = 'Karpeta';
 $labels['folders']  = 'Karpetak';
 $labels['foldername']  = 'Karpeta izena';
@@ -490,54 +434,47 @@ $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['properties'] = 'Ezaugarriak';
+$labels['folderproperties'] = 'Karpeta-ezaugarriak';
+$labels['parentfolder'] = 'Goragoko karpeta';
+$labels['location'] = 'Kokalekua';
+$labels['info'] = 'Informazioa';
+$labels['getfoldersize'] = 'Klikatu ikusteko karpetaren tamaina';
+$labels['changesubscription'] = 'Klikatu harpidetza aldatzeko';
+$labels['foldertype'] = 'Karpeta mota';
+$labels['personalfolder']  = 'Karpeta pribatua';
+$labels['otherfolder']  = 'Beste erabiltzaileen karpetak';
+$labels['sharedfolder']  = 'Karpeta publikoa';
 $labels['sortby'] = 'Honela ordenatu';
 $labels['sortasc']  = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
-$labels['undo'] = 'Undo';
-
-$labels['installedplugins'] = 'Installed plugins';
+$labels['undo'] = 'Desegin';
+$labels['installedplugins'] = 'Instalatutako plugin-ak';
 $labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-
-// units
+$labels['version'] = 'Bertsioa';
+$labels['source'] = 'Iturria';
+$labels['license'] = 'Lizentzia';
+$labels['support'] = 'Eskuratu laguntza';
 $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['english'] = 'Ingelesa';
+$labels['westerneuropean'] = 'Mendebaldeko Europearra';
+$labels['easterneuropean'] = 'Ekialdeko europearra';
+$labels['southeasterneuropean'] = 'Hego-ekialdeko europearra';
+$labels['baltic'] = 'Baltikoa';
+$labels['cyrillic'] = 'Zirilikoa';
+$labels['arabic'] = 'Arabiarra';
+$labels['greek'] = 'Grekoa';
+$labels['hebrew'] = 'Hebrearra';
+$labels['turkish'] = 'Turkiarra';
+$labels['nordic'] = 'Nordikoa';
 $labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
-
+$labels['celtic'] = 'Zeltiar';
+$labels['vietnamese'] = 'Vietnamdarra';
+$labels['japanese'] = 'Japoniarra';
+$labels['korean'] = 'Korearra';
+$labels['chinese'] = 'Txinatarra';
 ?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 6dd781530..7d2025804 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Errore bat gertatu da!';
 $messages['loginfailed']  = 'Saio hasierak huts egin du.';
 $messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-rik onartzen';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Eskatutako txartela ez da aurkitu';
 $messages['contactsearchonly'] = 'Sartu kontaktua aurkitzeko bilaketa daturen bat.';
 $messages['sendingfailed'] = 'Huts mezua bidaltzerakoan';
 $messages['senttooquickly'] = 'Itxaron $sec segundo mezua bidali aurretik, mesedez.';
-$messages['errorsavingsent'] = 'Errorea gertatu da bidalitako mezua gordetzean';
-$messages['errorsaving'] = 'Errore bat gertatu da gordetzean';
 $messages['errormoving'] = 'Ezin da mezua mugitu';
 $messages['errorcopying'] = 'Ezin d(ir)a kopiatu mezua(k).';
 $messages['errordeleting'] = 'Ezin da mezua ezabatu';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP errorea: $msg';
 $messages['emailformaterror'] = 'Helbide elektronikoa ez da baliozkoa: $email';
 $messages['toomanyrecipients'] = 'Hartzaile gehiegi. Txikitu hartzaile kopura hona $max.';
 $messages['maxgroupmembersreached'] = 'Taldeko partaideen kopurua $max -ko maximoa gainditzen du:';
-$messages['internalerror'] = 'Barne akatsa. Saiatu berriz, mesedez.';
 $messages['contactdelerror'] = 'Ezin d(ir)a kontaktua(k) ezabatu.';
 $messages['contactdeleted'] = 'Kontaktua(k) ongi ezabatu dira.';
 $messages['contactrestoreerror'] = 'Ezin d(ir)a ezabatutako kontaktua(k) leheneratu.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Ezin da karpeta sortu/mugi hautatutako goragok
 $messages['messagetoobig'] = 'Mezu-zatia handiegia da prozesatzeko.';
 $messages['attachmentvalidationerror'] = 'KONTUZ! Eranskin hau susmagarria da zeren bere izaera ez dator bat mezuan deklaratutakoarekin. Bidaltzailearekin fidatzen ez bazara ez zenuke nabigatzailean ireki behar eduki maltzurra izan dezakeelako.<br/><br/><em>Deklaratua: $expected; erreala: $detected</em>';
 $messages['noscriptwarning'] = 'Kontuz: web-posta zerbitzu honek Javascript behar du! Erabili nahi baduzu gaitu Javascript zure nabigatzailearen hobespenetan.';
-
 ?>
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 38154c23c..4abf65245 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'به اين پروژه خوش امديد';
 $labels['username']  = 'نام کاربر';
 $labels['password']  = 'شفر';
 $labels['server']    = 'سرور';
 $labels['login']     = 'داخل شدن';
-
-// taskbar
 $labels['logout']   = 'خروج';
 $labels['mail']     = 'ايميل';
 $labels['settings'] = 'تنظیمات شخصی';
 $labels['addressbook'] = 'کتاب ادرس';
-
-// mailbox names
 $labels['inbox']  = 'نامه های ارسالي';
 $labels['drafts'] = 'نامه های ناتکمیل';
 $labels['sent']   = 'ارسال شده';
 $labels['trash']  = 'اشغال دانی';
 $labels['junk']   = 'بیکاره';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'مضمون';
 $labels['from']    = 'ارسال کننده';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ګيرينده';
 $labels['cc']      = 'تکثیر';
 $labels['bcc']     = 'تکثیر پنهان';
 $labels['replyto'] = 'جواب نامه';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'تاريخ';
 $labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'پوشه ها';
 $labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'از شمار پيغام های حساب شده';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'تکثیر';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
-
 $labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
-
-// weekdays short
 $labels['sun'] = 'يکشنپبه';
 $labels['mon'] = 'دوشنبه';
 $labels['tue'] = 'سه شنبه';
@@ -82,8 +55,6 @@ $labels['wed'] = 'چهارشنبه';
 $labels['thu'] = 'پنج شنبه';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'شنبه';
-
-// weekdays long
 $labels['sunday']    = 'يکشنبه';
 $labels['monday']    = 'دوشنبه';
 $labels['tuesday']   = 'سه شنبه';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'چهارشنبه';
 $labels['thursday']  = 'پنج شنبه';
 $labels['friday']    = 'جمعه';
 $labels['saturday']  = 'شنبه';
-
-// months short
 $labels['jan']	= 'جنوری';
 $labels['feb']	= 'فبروری';
 $labels['mar']	= 'مارچ';
@@ -105,8 +74,6 @@ $labels['sep']	= 'سپتمبر';
 $labels['oct']	= 'اکتوبر';
 $labels['nov']	= 'نومبر';
 $labels['dec']	= 'دسمبر';
-
-// months long
 $labels['longjan']	= 'جنوری';
 $labels['longfeb']	= 'فبروری';
 $labels['longmar']	= 'مارچ';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'سپتمبر';
 $labels['longoct']	= 'اکتوبر';
 $labels['longnov']	= 'نومبر';
 $labels['longdec']	= 'دسمبر';
-
 $labels['today'] = 'امروز';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'بررسي کردن پيغام های جديد';
 $labels['compose']          = 'نوشتن پیام حدید';
 $labels['writenewmessage']  = 'ساختن پيغام جديد';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'جواب دادن به پيغام';
 $labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
-$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'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
@@ -145,253 +102,98 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = '‌طريقه استعمال ديسک';
 $labels['unknown']  = 'نامعلوم';
 $labels['unlimited']  = 'نامعين/ نامحدود';
-
 $labels['quicksearch']  = 'جستجوی سریع';
 $labels['resetsearch']  = 'بازنشاندن جستجو';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'ضميمه ها';
 $labels['upload'] = 'اپلود کردن';
-$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['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'] = 'يادداشت : اين رسيد شما را فقط اګاه ميسازد که پيغام به کامپیوتر گیرنده نمایش داده شده است  هیچ گارنتی وجود ندارد که گیرنده پیام این پیام را خوانده و یا مطالب آن را درک کرده باشد.';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
 $labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
-$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['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['listgroup'] = 'List group members';
 $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']  = 'اتومات';
@@ -400,13 +202,8 @@ $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'] = 'پيغام ايچ ټي ام ايل رانوشته کنيد';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'امضای حساب ایمیل بشکل ایچ تی ام ال';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -417,70 +214,26 @@ $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['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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'پوشه';
 $labels['folders']  = 'پوشه ها';
 $labels['foldername']  = 'نام پوشه';
@@ -490,54 +243,11 @@ $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['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 51ad5b717..643a9f7db 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -15,22 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'خطا رخ داد';
 $messages['loginfailed']  = 'خطا در ورود به سیستم';
 $messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
 $messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
 $messages['storageerror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
-$messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'خطای سرور: $msg';
 $messages['dberror'] = 'خطای پایگاه داده';
 $messages['requesttimedout'] = 'عدم پاسخگویی در زمان مقرر';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'نام سرور نامعتبر است';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
@@ -48,31 +40,23 @@ $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'] = 'امکان کپی پیام (ها) وجود ندارد';
 $messages['errordeleting'] = 'پيغام حذف شده نتوانست';
 $messages['errormarking'] = 'امکان انتخاب پیام (ها) وجود ندارد';
 $messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
 $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']  = 'لطفاً يک نام وارد کنيد';
@@ -84,7 +68,6 @@ $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 حساب کاربری یافت شد';
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
@@ -92,85 +75,24 @@ $messages['searching'] = 'در حال جستجو..';
 $messages['checking'] = 'در حال بررسی';
 $messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
 $messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'محتوای پوشه ها با موفقیت پاک شدند';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'با موفقیت حذف شد';
 $messages['converting'] = 'در حال پاک کردن ساختار';
 $messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست';
 $messages['fileuploaderror'] = 'بارگزاری فايل با خطا مواجه شد.';
 $messages['filesizeerror'] = 'تثبیت شده میباشد$size حجم فایل آپلود شده بیشتر از حجم کلی';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
 $messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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 79bfbbe9d..de23577a0 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'به $product خوش آمدید';
 $labels['username']  = 'نام کاربری';
 $labels['password']  = 'گذرواژه';
 $labels['server']    = 'سرویس‌دهنده';
 $labels['login']     = 'ورود';
-
-// taskbar
 $labels['logout']   = 'برون‌رفت';
-$labels['mail']     = 'نامه';
+$labels['mail']     = 'پست';
 $labels['settings'] = 'تنظیمات';
 $labels['addressbook'] = 'دفتر نشانی';
-
-// mailbox names
 $labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
 $labels['sent']   = 'فرستاده شده';
-$labels['trash']  = 'سطل آشغال';
+$labels['trash']  = 'حذف شده‌ها';
 $labels['junk']   = 'بنجل';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'نمایش نام واقعی برای پوشه‌های ویژه';
 $labels['subject'] = 'موضوع';
 $labels['from']    = 'از';
 $labels['sender']  = 'فرستنده';
@@ -54,13 +44,11 @@ $labels['priority'] = 'اولویت';
 $labels['organization'] = 'سازمان';
 $labels['readstatus'] = 'وضعیت خوانده شدن';
 $labels['listoptions'] = 'فهرست گزینه‌ها...';
-
 $labels['mailboxlist'] = 'پوشه‌ها';
 $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']   = 'انتقال به...';
@@ -68,13 +56,9 @@ $labels['download'] = 'بارگیری';
 $labels['open']     = 'باز کردن';
 $labels['showattachment'] = 'نمایش';
 $labels['showanyway'] = 'نمایش آن در هر صورت';
-
 $labels['filename'] = 'نام پرونده';
 $labels['filesize'] = 'اندازه پرونده';
-
 $labels['addtoaddressbook'] = 'افزودن به دفتر نشانی‌ها';
-
-// weekdays short
 $labels['sun'] = '۱ش';
 $labels['mon'] = '۲ش';
 $labels['tue'] = '۳ش';
@@ -82,17 +66,13 @@ $labels['wed'] = '۴ش';
 $labels['thu'] = '۵ش';
 $labels['fri'] = 'جم';
 $labels['sat'] = 'ش';
-
-// weekdays long
 $labels['sunday']    = 'یک‌شنبه';
 $labels['monday']    = 'دوشنبه';
 $labels['tuesday']   = 'سه‌شنبه';
 $labels['wednesday'] = 'چهارشنبه';
 $labels['thursday']  = 'پنج‌شنبه';
-$labels['friday']    = 'جمعه';
+$labels['friday']    = 'آدینه';
 $labels['saturday']  = 'شنبه';
-
-// months short
 $labels['jan']	= 'ژان';
 $labels['feb']	= 'فور';
 $labels['mar']	= 'مار';
@@ -105,8 +85,6 @@ $labels['sep']	= 'سپت';
 $labels['oct']	= 'اُکت';
 $labels['nov']	= 'نوا';
 $labels['dec']	= 'دسا';
-
-// months long
 $labels['longjan']	= 'ژانویه';
 $labels['longfeb']	= 'فوریه';
 $labels['longmar']	= 'مارس';
@@ -119,23 +97,20 @@ $labels['longsep']	= 'سپتامبر';
 $labels['longoct']	= 'اکتبر';
 $labels['longnov']	= 'نوامبر';
 $labels['longdec']	= 'دسامبر';
-
 $labels['today'] = 'امروز';
-
-// toolbar buttons
-$labels['refresh']          = 'نوسازی';
+$labels['refresh']          = 'بازخوانی';
 $labels['checkmail']        = 'بررسی پیغام‌های جدید';
-$labels['compose']          = 'نوشتن پیغام';
+$labels['compose']          = 'نوشتن';
 $labels['writenewmessage']  = 'ایجاد پیغام جدید';
 $labels['reply']            = 'پاسخ';
 $labels['replytomessage']   = 'پاسخ به فرستنده';
 $labels['replytoallmessage'] = 'پاسخ به فهرست یا به فرستنده و تمام گیرنده‌ها';
 $labels['replyall']         = 'پاسخ به همه';
 $labels['replylist']        = 'پاسخ به فهرست';
-$labels['forward']          = 'ارجاع';
-$labels['forwardinline']    = 'ارجاع خطی';
-$labels['forwardattachment'] = 'ارجاع به صورت پیوست';
-$labels['forwardmessage']   = 'ارجاع پیغام';
+$labels['forward']          = 'باز ارسال';
+$labels['forwardinline']    = 'باز ارسال خطی';
+$labels['forwardattachment'] = 'باز ارسال به صورت پیوست';
+$labels['forwardmessage']   = 'باز ارسال پیغام';
 $labels['deletemessage']    = 'حذف پیغام';
 $labels['movemessagetotrash'] = 'انتقال پیغام به زباله‌دان';
 $labels['printmessage']     = 'چاپ این پیغام';
@@ -154,8 +129,7 @@ $labels['markunflagged']    = 'به عنوان نشانه‌گذاری نشده'
 $labels['moreactions']      = 'کارهای دیگر...';
 $labels['more']             = 'بيشتر';
 $labels['back']             = 'بازگشت';
-$labels['options']          = 'تنظیمات';
-
+$labels['options']          = 'گزینه‌ها';
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ‌کدام';
@@ -163,7 +137,7 @@ $labels['currpage'] = 'صفحه جاری';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'با پیوست';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'باز کردن همه';
 $labels['expand-unread'] = 'بازکردن خوانده نشده‌ها';
 $labels['collapse-all'] = 'جمع کردن همه';
 $labels['threaded'] = 'رشته شده';
-
 $labels['autoexpand_threads'] = 'باز کردن رشته‌های پیغام';
 $labels['do_expand'] = 'همه رشته‌ها';
 $labels['expand_only_unread'] = 'فقط با پیغام‌های خوانده نشده';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'ستون‌های فهرست';
 $labels['listsorting'] = 'ستون مرتب‌سازی';
 $labels['listorder'] = 'ترتیب مرتب‌سازی';
 $labels['listmode'] = 'نوع مشاهده فهرست';
-
 $labels['folderactions'] = 'اعمال پوشه...';
 $labels['compact'] = 'فشرده';
 $labels['empty'] = 'خالی';
-$labels['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'وارد کردن پیغام‌ها';
 $labels['quota'] = 'فضای استفاده شده';
 $labels['unknown']  = 'ناشناخته';
 $labels['unlimited']  = 'نامحدود';
-
 $labels['quicksearch']  = 'جستجوی سریع';
 $labels['resetsearch']  = 'جستجوی دوباره';
 $labels['searchmod']  = 'اصلاحات جستجو';
 $labels['msgtext']  = 'کل پیغام';
 $labels['body']  = 'بدنه';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'نوع';
+$labels['namex'] = 'نام';
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
 $labels['changeformattext'] = 'نمایش در قالب متنی';
 $labels['changeformathtml'] = 'نمایش در قالب اچ‌تی‌ام‌ال';
-
-// message compose
 $labels['editasnew']      = 'ویرایش به عنوان جدید';
 $labels['send']           = 'ارسال';
 $labels['sendmessage']    = 'ارسال پیغام';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'رسید دریافت';
 $labels['dsn']            = 'اعلام وضعیت دریافت';
 $labels['mailreplyintro'] = 'در $date، $sender نوشته است:';
 $labels['originalmessage'] = 'پیغام اصلی';
-
 $labels['editidents']    = 'ویرایش شناسه‌ها';
 $labels['spellcheck']    = 'املاء';
 $labels['checkspelling'] = 'بررسی املایی';
 $labels['resumeediting'] = 'ادامه‌ی ویرایش';
 $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['highest'] = 'بیش‌ترین';
-
 $labels['nosubject']  = '(بدون موضوع)';
 $labels['showimages'] = 'نمایش عکس‌ها';
 $labels['alwaysshow'] = 'همیشه عکس‌های دریافتی از $sender را نمایش داده شود';
@@ -251,25 +215,19 @@ $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'] = 'تذکر: این رسید فقط تصدیق می‌کند که پیغام، روی رایانه گیرنده نمایش داده شده است. هیچ تضمینی نیست که گیرنده، محتوای پیغام را خوانده یا فهمیده باشد.';
-
-// address boook
 $labels['name']         = 'نمایش نام';
 $labels['firstname']    = 'نام';
 $labels['surname']      = 'نام خانوادگی';
@@ -304,7 +262,6 @@ $labels['search'] = 'جستجو';
 $labels['advsearch'] = 'جستجوی پیشرفته';
 $labels['advanced'] = 'پیشرفته';
 $labels['other'] = 'سایر';
-
 $labels['typehome']   = 'منزل';
 $labels['typework']   = 'کار';
 $labels['typeother']  = 'سایر';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = 'دستیار';
 $labels['typehomepage']  = 'صفحه خانگی';
 $labels['typeblog'] = 'بلاگ';
 $labels['typeprofile'] = 'نمایه';
-
 $labels['addfield'] = 'افزودن زمینه...';
 $labels['addcontact'] = 'افزودن تماس جدید';
 $labels['editcontact'] = 'ویرایش تماس';
 $labels['contacts'] = 'تماس‌ها';
 $labels['contactproperties'] = 'خصوصیات تماس';
 $labels['personalinfo'] = 'اطلاعات شخصی';
-
 $labels['edit']   = 'ویرایش';
 $labels['cancel'] = 'لغو';
 $labels['save']   = 'ذخیره';
@@ -335,7 +290,6 @@ $labels['rename'] = 'تغییر نام';
 $labels['addphoto'] = 'افزودن';
 $labels['replacephoto'] = 'جایگزینی';
 $labels['uploadphoto'] = 'بارگذاری تصویر';
-
 $labels['newcontact']     = 'ایجاد کارت تماس جدید';
 $labels['deletecontact']  = 'حذف تماس‌های انتخاب شده';
 $labels['composeto']      = 'نوشتن پیغام به';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'افزودن گروه تماس جدید';
 $labels['grouprename']    = 'تغییر نام گروه';
 $labels['groupdelete']    = 'حذف گروه';
 $labels['groupremoveselected'] = 'حذف نشانی‌های انتخاب شده از گروه';
-
 $labels['previouspage']   = 'نمایش صفحه قبلی';
 $labels['firstpage']      = 'نمایش صفحه اول';
 $labels['nextpage']       = 'نمایش صفحه بعدی';
 $labels['lastpage']       = 'نمایش صفحه آخر';
-
 $labels['group'] = 'گروه';
 $labels['groups'] = 'گروه‌ها';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'فهرست اعضاء گروه';
 $labels['personaladrbook'] = 'نشانی‌های شخصی';
-
 $labels['searchsave'] = 'ذخیره جستجو';
 $labels['searchdelete'] = 'حذف جستجو';
-
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'وارد کردن تماس‌ها';
 $labels['importfromfile'] = 'وارد کردن از پرونده‌ی:';
-$labels['importtarget'] = 'افزودن تماس‌های جدید به دفتر نشانی:';
+$labels['importtarget'] = 'افزودن تماس‌ها به';
 $labels['importreplace'] = 'جایگیزینی کامل دفتر نشانی';
+$labels['importgroups'] = 'وارد کردن وظایف گروه';
+$labels['importgroupsall'] = 'همه (ایجاد گروه‌ها در صورت نیاز)';
+$labels['importgroupsexisting'] = 'فقط برای گروه‌های موجود';
 $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 پیغام';
@@ -406,7 +354,7 @@ $labels['htmleditor'] = 'HTML ‌نوشتن پیغام‌های';
 $labels['htmlonreply'] = 'فقط در پاسخ به پیغام HTML';
 $labels['htmlonreplyandforward'] = 'در بازگردانی یا پاسخ به پیغام‌های HTML';
 $labels['htmlsignature'] = 'HTML امضای';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'نمایش آدرس ایمیل با نام نمایشی';
 $labels['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
 $labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
@@ -476,11 +424,10 @@ $labels['spellcheckignorenums'] = 'نادیده گرفتن کلمات دارای
 $labels['spellcheckignorecaps'] = 'نادیده گرفتن کلمات با حروف بزرگ';
 $labels['addtodict'] = 'اضافه کردن به واژه‌نامه';
 $labels['mailtoprotohandler'] = 'ثبت نگه‌دارنده پروتوکل برای mailto: پیوندها';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'بکار بردن پاپ‌آپ‌ها به صورت پنجره‌ی استاندارد';
 $labels['forwardmode'] = 'بازگردانی پیغام';
 $labels['inline'] = 'خطی';
 $labels['asattachment'] = 'به عنوان پیوست';
-
 $labels['folder']  = 'پوشه';
 $labels['folders']  = 'پوشه‌ها';
 $labels['foldername']  = 'نام پوشه';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'نوع پوشه';
 $labels['personalfolder']  = 'پوشه خصوصی';
 $labels['otherfolder']  = 'پوشه کاربران دیگر';
 $labels['sharedfolder']  = 'پوشه عمومی';
-
 $labels['sortby'] = 'مرتب‌سازی بر اساس';
 $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'] = 'اروپای غربی';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'ویتنامی';
 $labels['japanese'] = 'ژاپنی';
 $labels['korean'] = 'کره‌ای';
 $labels['chinese'] = 'چینی';
-
 ?>
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 3f3f861d6..43f5a6c2a 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'خطایی رخ داد!';
 $messages['loginfailed']  = 'ورود ناموفق بود.';
 $messages['cookiesdisabled'] = 'مرورگر شما کوکی‌ها را قبول نمی‌کند.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'مخاطب درخواست شده پیدا نشد
 $messages['contactsearchonly'] = 'برای یافتن مخاطب عبارتی را جستجو کنید';
 $messages['sendingfailed'] = 'ارسال پیغام ناموفق بود.';
 $messages['senttooquickly'] = 'لطفا قبل از ارسال این پیغام $sec ثانیه صبر کنید.';
-$messages['errorsavingsent'] = 'در لحظه ذخیره پیغام ارسال شده، مشکلی رخ داد.';
-$messages['errorsaving'] = 'هنگام ذخیره‌سازی، مشکلی رخ داد.';
 $messages['errormoving'] = 'پیغام(ها) منتقل نشدند.';
 $messages['errorcopying'] = 'پیغام(ها) کپی نشدند.';
 $messages['errordeleting'] = 'پیغام(ها) حذف نشدند.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'خطای SMTP: $msg';
 $messages['emailformaterror'] = 'پست الکترونیکی نامعتبر: $email';
 $messages['toomanyrecipients'] = 'گیرنده‌های بیش از اندازه: تعداد گیرنده ها را به $max کاهش دهید.';
 $messages['maxgroupmembersreached'] = 'تعداد اعضای گروه بیشتر از $max است.';
-$messages['internalerror'] = 'خطای داخلی رخ داد. لطفا دوباره امتحان کنید.';
 $messages['contactdelerror'] = 'حذف مخاطب(ها) انجام شد.';
 $messages['contactdeleted'] = 'مخاطب(ها) با موفقیت حذف شدند.';
 $messages['contactrestoreerror'] = 'مخاطب(های) حذف شده بازگردانی نخواهند شد.';
@@ -172,5 +167,4 @@ $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 ef0f0bff0..8a9064028 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Saapuneet';
 $labels['drafts'] = 'Luonnokset';
 $labels['sent']   = 'Lähetetyt';
 $labels['trash']  = 'Roskakori';
 $labels['junk']   = 'Roskaposti';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Aihe';
 $labels['from']    = 'Lähettäjä';
 $labels['sender']  = 'Lähettäjä';
@@ -54,13 +43,11 @@ $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
 $labels['readstatus'] = 'Luettu';
 $labels['listoptions'] = 'Listaa valinnat...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +55,9 @@ $labels['download'] = 'lataa';
 $labels['open']     = 'Avaa';
 $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';
@@ -82,8 +65,6 @@ $labels['wed'] = 'Ke';
 $labels['thu'] = 'To';
 $labels['fri'] = 'Pe';
 $labels['sat'] = 'La';
-
-// weekdays long
 $labels['sunday']    = 'Sunnuntai';
 $labels['monday']    = 'Maanantai';
 $labels['tuesday']   = 'Tiistai';
@@ -91,8 +72,6 @@ $labels['wednesday'] = 'Keskiviikko';
 $labels['thursday']  = 'Torstai';
 $labels['friday']    = 'Perjantai';
 $labels['saturday']  = 'Lauantai';
-
-// months short
 $labels['jan']	= 'Tammi';
 $labels['feb']	= 'Helmi';
 $labels['mar']	= 'Maalis';
@@ -105,8 +84,6 @@ $labels['sep']	= 'Syys';
 $labels['oct']	= 'Loka';
 $labels['nov']	= 'Marras';
 $labels['dec']	= 'Joulu';
-
-// months long
 $labels['longjan']	= 'Tammikuu';
 $labels['longfeb']	= 'Helmikuu';
 $labels['longmar']	= 'Maaliskuu';
@@ -119,10 +96,7 @@ $labels['longsep']	= 'Syyskuu';
 $labels['longoct']	= 'Lokakuu';
 $labels['longnov']	= 'Marraskuu';
 $labels['longdec']	= 'Joulukuu';
-
 $labels['today'] = 'Tänään';
-
-// toolbar buttons
 $labels['refresh']          = 'Päivitä';
 $labels['checkmail']        = 'Tarkista saapuneet viestit';
 $labels['compose']          = 'Viestin kirjoitus';
@@ -155,7 +129,6 @@ $labels['moreactions']      = 'Lisää toimintoja...';
 $labels['more']             = 'Lisää';
 $labels['back']             = 'Takaisin';
 $labels['options']          = 'Asetukset';
-
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
@@ -174,7 +147,6 @@ $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ä';
@@ -190,29 +162,24 @@ $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['importmessages'] = 'Tuo viestejä';
-
 $labels['quota'] = 'Levytila';
 $labels['unknown']  = 'tuntematon';
 $labels['unlimited']  = 'rajoittamaton';
-
 $labels['quicksearch']  = 'Pikahaku';
 $labels['resetsearch']  = 'Nollaa haku';
 $labels['searchmod']  = 'Hakukriteerit';
 $labels['msgtext']  = 'Koko viesti';
 $labels['body']  = 'Runko';
 $labels['type'] = 'Tyyppi';
-
+$labels['namex'] = 'Nimi';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
 $labels['changeformattext'] = 'Näytä raakatekstimuodossa';
 $labels['changeformathtml'] = 'Näytä HTML-muodossa';
-
-// message compose
 $labels['editasnew']      = 'Muokkaa uutena';
 $labels['send']           = 'Lähetä';
 $labels['sendmessage']    = 'Lähetä viesti';
@@ -224,26 +191,22 @@ $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['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
 $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['highest'] = 'Korkein';
-
 $labels['nosubject']  = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 $labels['alwaysshow'] = 'Näytä aina lähettäjältä $sender saapuneet kuvat';
@@ -251,25 +214,19 @@ $labels['isdraft']    = 'Tämä on luonnosviesti.';
 $labels['andnmore']   = '$nr lisää...';
 $labels['togglemoreheaders'] = 'Näytä lisää viestiotsakkeita';
 $labels['togglefullheaders'] = 'Viestin otsakkeet päällä/pois';
-
 $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.';
-
-// address boook
 $labels['name']         = 'Näkyvä nimi';
 $labels['firstname']    = 'Etunimi';
 $labels['surname']      = 'Sukunimi';
@@ -304,7 +261,6 @@ $labels['search'] = 'Haku';
 $labels['advsearch'] = 'Tarkennettu haku';
 $labels['advanced'] = 'Lisäasetukset';
 $labels['other'] = 'Muu';
-
 $labels['typehome']   = 'Koti';
 $labels['typework']   = 'Työ';
 $labels['typeother']  = 'Muu';
@@ -319,14 +275,12 @@ $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['cancel'] = 'Peruuta';
 $labels['save']   = 'Tallenna';
@@ -335,7 +289,6 @@ $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';
@@ -349,46 +302,34 @@ $labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
 $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['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
-$labels['listgroup'] = 'List group members';
 $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'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).';
 $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';
@@ -478,9 +419,7 @@ $labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['mailtoprotohandler'] = 'Rekisteröi mailto:-linkkien protokollakäsitteljä';
 $labels['standardwindows'] = 'Käsittele popup-ikkunoita tavallisina ikkunoina';
 $labels['forwardmode'] = 'Viestin välitys';
-$labels['inline'] = 'inline';
 $labels['asattachment'] = 'liitteenä';
-
 $labels['folder']  = 'Kansio';
 $labels['folders']  = 'Kansiot';
 $labels['foldername']  = 'Kansion nimi';
@@ -501,26 +440,20 @@ $labels['foldertype'] = 'Kansion tyyppi';
 $labels['personalfolder']  = 'Yksityinen kansio';
 $labels['otherfolder']  = 'Toisen käyttäjän kansio';
 $labels['sharedfolder']  = 'Julkinen kansio';
-
 $labels['sortby'] = 'Järjestä';
 $labels['sortasc']  = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
 $labels['undo'] = 'Kumoa';
-
 $labels['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';
@@ -539,5 +472,4 @@ $labels['vietnamese'] = 'Vietnamilainen';
 $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 adcb36607..1b3c3ea49 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
@@ -28,6 +26,8 @@ $messages['dberror'] = 'Tietokantavirhe!';
 $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
+$messages['erroroverquota'] = 'Toiminnon suoritus epäonnistui. Levytila on loppu.';
+$messages['erroroverquotadelete'] = 'Levytila on loppu. Paina SHIFT+DEL poistaaksesi viestin.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
@@ -54,8 +54,8 @@ $messages['contactnotfound'] = 'Pyydettyä yhteystietoa ei löytynyt';
 $messages['contactsearchonly'] = 'Anna hakusanoja, joilla yhteystietoja haetaan';
 $messages['sendingfailed'] = 'Viestin lähetys epäonnistui';
 $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämistä';
-$messages['errorsavingsent'] = 'Lähetetyn viestin tallennuksessa tapahtui virhe';
-$messages['errorsaving'] = 'Tallennuksessa tapahtui virhe';
+$messages['errorsavingsent'] = 'Virhe tallennettaessa lähetettyä viestiä.';
+$messages['errorsaving'] = 'Virhe tallennettaessa.';
 $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
@@ -88,7 +88,7 @@ $messages['contactsearchsuccessful'] = 'Löydetty $nr yhteystietoa';
 $messages['searchnomatch'] = 'Haku ei tuottanut tuloksia';
 $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
-$messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt';
+$messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt.';
 $messages['folderdeleted'] = 'Kansio poistettu onnistuneesti';
 $messages['foldersubscribed'] = 'Kansio tilattu onnistuneesti.';
 $messages['folderunsubscribed'] = 'Kansion tilaus poistettu onnistuneesti.';
@@ -99,13 +99,16 @@ $messages['converting'] = 'Poistetaan asettelu viestistä...';
 $messages['messageopenerror'] = 'Virhe kopioitaessa viestiä palvelimelta';
 $messages['fileuploaderror'] = 'Tiedoston lähettäminen epäonnistui';
 $messages['filesizeerror'] = 'Lähetettävä tiedosto ylittää sallitun enimmäiskoon $size';
-$messages['copysuccess'] = 'Kopioitu $nr osoitetta onnistuneesti';
-$messages['copyerror'] = 'Yhtään osoitetta ei voitu kopioida';
+$messages['copysuccess'] = '$nr yhteystietoa kopioitiin onnistuneesti.';
+$messages['movesuccess'] = '$nr yhteystietoa siirrettiin onnistuneesti.';
+$messages['copyerror'] = 'Yhdenkään yhteystiedon kopiointi ei onnistunut.';
+$messages['moveerror'] = 'Minkään yhteystiedon siirto ei onnistunut.';
 $messages['sourceisreadonly'] = 'Tämän osoitteen lähde on kirjoitussuojattu';
 $messages['errorsavingcontact'] = 'Yhteystietoa ei voitu tallentaa';
 $messages['movingmessage'] = 'Siirretään viestiä...';
 $messages['copyingmessage'] = 'Kopioidaan viestiä...';
 $messages['copyingcontact'] = 'Kopioidaan yhteystietoja...';
+$messages['movingcontact'] = 'Siirretään yhteystieto(j)a...';
 $messages['deletingmessage'] = 'Poistetaan viestejä...';
 $messages['markingmessage'] = 'Merkitään viestejä...';
 $messages['addingmember'] = 'Lisätään yhteystietoja ryhmään...';
@@ -119,11 +122,12 @@ $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['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['importmessagesuccess'] = '$nr viestiä tuotiin onnistuneesti';
+$messages['importmessageerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen viesti tai mailbox-tiedosto';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
 $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
@@ -132,12 +136,12 @@ $messages['smtpconnerror'] = 'SMTP-virhe ($code): Palvelimelle yhdistäminen ep�
 $messages['smtpautherror'] = 'SMTP-virhe ($code): Tunnistus epäonnistui';
 $messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettaminen epäonnistui ($msg)';
 $messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui ($msg)';
-$messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
+$messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa.';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
 $messages['emailformaterror'] = 'Virheellinen sähköpostiosoite: $email';
 $messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
 $messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
-$messages['internalerror'] = 'Ilmeni sisäinen virhe. Yritä uudelleen.';
+$messages['internalerror'] = 'Sisäinen virhe. Yritä uudelleen.';
 $messages['contactdelerror'] = 'Yhteystietoja ei voitu poistaa.';
 $messages['contactdeleted'] = 'Yhteystiedot poistettu onnistuneesti.';
 $messages['contactrestoreerror'] = 'Poistettujen yhteystietojen palautus epäonnistui.';
@@ -163,7 +167,6 @@ $messages['invalidimageformat'] = 'Virheellinen kuvamuoto.';
 $messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 $messages['parentnotwritable'] = 'Kansiota ei voitu siirtää tai luoda valittuun yläkansioon. Ei käyttöoikeutta.';
 $messages['messagetoobig'] = 'Viestiosa on liian suuri prosessoitavaksi.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Varoitus! Tämä liitetiedosto on epäilyttävä, koska se ei vastaa ilmoitettua tiedostotyyppiä. Jos et luoda lähettäjään, älä avaa liitetiedostoa välttääksesi mahdollista vahingollista aineistoa.<br/><br/><em>Odotettu: $expected; löydetty: $detected</em>';
 $messages['noscriptwarning'] = 'Varoitus: Tämä verkkopohjainen sähköpostipalvelu vaatii Javascriptin toimiakseen. Ota Javascript käyttöön selaimesi asetuksista.';
-
 ?>
diff --git a/program/localization/fr_FR/csv2vcard.inc b/program/localization/fr_FR/csv2vcard.inc
index bb77001b5..d28df7a8a 100644
--- a/program/localization/fr_FR/csv2vcard.inc
+++ b/program/localization/fr_FR/csv2vcard.inc
@@ -15,14 +15,7 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
-// This is a list of CSV column names specified in CSV file header
-// These must be original texts used in Outlook/Thunderbird exported csv files
-// Encoding UTF-8
-
 $map = array();
-
-// MS Outlook 2010
 $map['anniversary'] = "Anniversaire de mariage ou fête";
 $map['assistants_name'] = "Nom de l''assistant(e)";
 $map['assistants_phone'] = "Téléphone de l''assistant(e)";
@@ -69,8 +62,6 @@ $map['spouse'] = "Conjoint(e)";
 $map['suffix'] = "Suffixe";
 $map['title'] = "Titre";
 $map['web_page'] = "Page Web";
-
-// Thunderbird
 $map['birth_day'] = "Jour";
 $map['birth_month'] = "Mois";
 $map['birth_year'] = "Année de naissance";
@@ -91,6 +82,4 @@ $map['work_phone'] = "Tél. professionnel";
 $map['work_address'] = "Adresse professionnelle";
 $map['work_country'] = "Région";
 $map['work_zipcode'] = "Code postal";
-
-// Other
 $map['_home_city'] = "Ville";
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 3dc0e5ef8..dd0acf4f1 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Bienvenue sur $product';
 $labels['username']  = 'Utilisateur';
 $labels['password']  = 'Mot de passe';
 $labels['server']    = 'Serveur';
 $labels['login']     = 'Connexion';
-
-// taskbar
 $labels['logout']   = 'Déconnexion';
 $labels['mail']     = 'Courriel';
 $labels['settings'] = 'Paramètres';
 $labels['addressbook'] = 'Carnet d\'adresses';
-
-// mailbox names
 $labels['inbox']  = 'Messages reçus';
 $labels['drafts'] = 'Brouillons';
 $labels['sent']   = 'Messages envoyés';
 $labels['trash']  = 'Corbeille';
 $labels['junk']   = 'Indésirables';
 $labels['show_real_foldernames'] = 'Montrer les noms réels pour les dossiers spéciaux';
-
-// message listing
 $labels['subject'] = 'Objet';
 $labels['from']    = 'De';
 $labels['sender']  = 'Expéditeur';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Statut de lecture';
 $labels['listoptions'] = 'Lister les options...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Télécharger';
 $labels['open']     = 'Ouvrir';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Jeu';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sam';
-
-// weekdays long
 $labels['sunday']    = 'Dimanche';
 $labels['monday']    = 'Lundi';
 $labels['tuesday']   = 'Mardi';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mercredi';
 $labels['thursday']  = 'Jeudi';
 $labels['friday']    = 'Vendredi';
 $labels['saturday']  = 'Samedi';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Fév';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $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';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Septembre';
 $labels['longoct']	= 'Octobre';
 $labels['longnov']	= 'Novembre';
 $labels['longdec']	= 'Décembre';
-
 $labels['today'] = 'Aujourd\'hui';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualiser';
 $labels['checkmail']        = 'Vérification des nouveaux messages';
 $labels['compose']          = 'Composer un nouveau message';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Tout afficher';
 $labels['expand-unread'] = 'Afficher non-lu(s)';
 $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';
@@ -190,16 +163,13 @@ $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['importmessages'] = 'Importer des messages';
-
 $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';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Message entier';
 $labels['body']  = 'Corps';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Nom';
-
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
 $labels['changeformattext'] = 'Afficher au format texte';
 $labels['changeformathtml'] = 'Afficher au format HTML';
-
-// message compose
 $labels['editasnew']      = 'Éditer en tant que nouveau message';
 $labels['send']           = 'Envoyer';
 $labels['sendmessage']    = 'Envoyer un message';
@@ -225,26 +192,22 @@ $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']    = 'Orthographe';
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
 $labels['revertto']      = 'Revenir à';
-
 $labels['attach'] = 'Joindre';
 $labels['attachments'] = 'Fichiers joints';
 $labels['upload'] = 'Transférer';
 $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['highest'] = 'La plus élevée';
-
 $labels['nosubject']  = '(pas de sujet)';
 $labels['showimages'] = 'Afficher les images';
 $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
@@ -252,25 +215,19 @@ $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 ait lu ou compris le contenu du message.';
-
-// address boook
 $labels['name']         = 'Nom à afficher';
 $labels['firstname']    = 'Prénom';
 $labels['surname']      = 'Nom';
@@ -305,7 +262,6 @@ $labels['search'] = 'Rechercher';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
-
 $labels['typehome']   = 'Domicile';
 $labels['typework']   = 'Travail';
 $labels['typeother']  = 'Autre';
@@ -320,14 +276,12 @@ $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['cancel'] = 'Annuler';
 $labels['save']   = 'Enregistrer';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
 $labels['uploadphoto'] = 'Transférer une photo';
-
 $labels['newcontact']     = 'Créer un nouveau contact';
 $labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
 $labels['composeto']      = 'Écrire un message à';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
 $labels['grouprename']    = 'Renommer le groupe';
 $labels['groupdelete']    = 'Supprimer le groupe';
 $labels['groupremoveselected'] = 'Retirer 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['group'] = 'Groupe';
 $labels['groups'] = 'Groupes';
 $labels['listgroup'] = 'Liste des membres du groupe';
 $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 :';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Tous (créer les groupes si nécessaire)';
 $labels['importgroupsexisting'] = 'Uniquement pour les groupes existants';
 $labels['importdesc'] = 'Vous pouvez transférer 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 (champs séparés par une virgule).';
 $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';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Manipuler les menus surgissants comme des fenêtre
 $labels['forwardmode'] = 'Transfert des messages';
 $labels['inline'] = 'dans le corps';
 $labels['asattachment'] = 'en pièce jointe';
-
 $labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossiers';
 $labels['foldername']  = 'Nom du dossier';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Type de répertoire';
 $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['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'] = 'Obtenir un support technique';
-
-// 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';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamien';
 $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 a736e103e..fcf9eaf92 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -15,157 +15,159 @@
 
  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['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';
+$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.';
 $messages['servererror'] = 'Erreur Serveur !';
-$messages['servererrormsg'] = 'Erreur du serveur: $msg';
-$messages['dberror'] = 'Erreur avec la base de donnée!';
+$messages['servererrormsg'] = 'Erreur du serveur : $msg';
+$messages['dberror'] = 'Erreur avec la base de données !';
 $messages['requesttimedout'] = 'Délai de la requête expiré';
-$messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule';
-$messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée';
+$messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule.';
+$messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée.';
 $messages['erroroverquota'] = 'Impossible d\'effectuer cette opération. Plus d\'espace libre.';
 $messages['erroroverquotadelete'] = 'Plus d\'espace libre. Utilisez SHIFT+DEL pour supprimer un message.';
 $messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
 $messages['nomessagesfound'] = 'Cette boîte aux lettres ne contient aucun message.';
-$messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
+$messages['loggedout'] = 'Vous vous êtes correctement déconnecté. Au revoir !';
 $messages['mailboxempty'] = 'La boîte aux lettres est vide.';
 $messages['refreshing'] = 'Rafraîchissement en cours...';
-$messages['loading'] = 'Chargement...';
-$messages['uploading'] = 'Envoi du fichier...';
-$messages['uploadingmany'] = 'Envoi des fichiers ...';
-$messages['loadingdata'] = 'Chargement des données...';
+$messages['loading'] = 'Chargement en cours...';
+$messages['uploading'] = 'Transfert du fichier en cours...';
+$messages['uploadingmany'] = 'Transfert des fichiers en cours...';
+$messages['loadingdata'] = 'Chargement des données en cours...';
 $messages['checkingmail'] = 'Vérification des nouveaux messages...';
-$messages['sendingmessage'] = 'Expédition du message...';
-$messages['messagesent'] = 'Message expédié.';
-$messages['savingmessage'] = 'Sauvegarde du message...';
-$messages['messagesaved'] = 'Message sauvegardé dans Brouillons';
-$messages['successfullysaved'] = 'Sauvegarde effectuée';
-$messages['addedsuccessfully'] = 'Contact ajouté dans le carnet d\'adresses';
-$messages['contactexists'] = 'Cette adresse courriel est utilisée par un autre contact';
+$messages['sendingmessage'] = 'Envoi du message en cours...';
+$messages['messagesent'] = 'Le message a bien été expédié.';
+$messages['savingmessage'] = 'Sauvegarde du message en cours...';
+$messages['messagesaved'] = 'Message sauvegardé dans Brouillons.';
+$messages['successfullysaved'] = 'La sauvegarde a bien été effectuée.';
+$messages['addedsuccessfully'] = 'Le contact a bien été ajouté dans le carnet d\'adresses.';
+$messages['contactexists'] = 'Cette adresse courriel est utilisée par un autre contact.';
 $messages['contactnameexists'] = 'Il existe déjà un contact nommé ainsi.';
 $messages['blockedimages'] = 'Les images distantes sont bloquées pour protéger votre vie privée.';
 $messages['encryptedmessage'] = 'Désolé, ce message est chiffré et ne peut être affiché.';
-$messages['nocontactsfound'] = 'Aucun contact n\'a pu être trouvé';
+$messages['nocontactsfound'] = 'Aucun contact n\'a pu être trouvé.';
 $messages['contactnotfound'] = 'Le contact demandé n\'a pas été trouvé.';
-$messages['contactsearchonly'] = 'Entrez un ou plusieurs mots clés pour trouver des contacts';
-$messages['sendingfailed'] = 'L\'envoi du message a échoué';
-$messages['senttooquickly'] = 'Vous devez attendre $sec s. pour envoyer le message';
-$messages['errorsavingsent'] = 'Une erreur est survenue pendant la sauvegarde du message envoyé';
-$messages['errorsaving'] = 'Une erreur a empêché la sauvegarde';
-$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['contactsearchonly'] = 'Entrez un ou plusieurs mots clés pour trouver des contacts.';
+$messages['sendingfailed'] = 'L\'envoi du message a échoué.';
+$messages['senttooquickly'] = 'Veuillez patienter $sec s. pour envoyer ce message.';
+$messages['errorsavingsent'] = 'Une erreur est apparue durant l\'enregistrement du message envoyé.';
+$messages['errorsaving'] = 'Une erreur est apparue durant l\'enregistrement.';
+$messages['errormoving'] = 'Impossible de déplacer le(s) message(s).';
+$messages['errorcopying'] = 'Impossible de copier le(s) message(s).';
+$messages['errordeleting'] = 'Impossible de supprimer le(s) message(s).';
+$messages['errormarking'] = 'Impossible de marquer le(s) message(s).';
 $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['contactdeleting'] = 'Suppression de contact(s)...';
-$messages['groupdeleting'] = 'Suppression du groupe ...';
+$messages['contactdeleting'] = 'Suppression de contact(s) en cours...';
+$messages['groupdeleting'] = 'Suppression du groupe...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
 $messages['foldermoving'] = 'Déplacement du dossier...';
 $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['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['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['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['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';
-$messages['nosearchname'] = 'Entrez un nom de contact ou un courriel';
-$messages['notuploadedwarning'] = 'Certaines pièces jointes sont en cours d\'expédition : attendez ou annulez l\'envoi.';
-$messages['searchsuccessful'] = '$nr messages trouvés';
+$messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche.';
+$messages['nosearchname'] = 'Entrez un nom de contact ou un courriel.';
+$messages['notuploadedwarning'] = 'Toutes les pièces jointes n\'ont pas encore été transférées. Veuillez patienter ou annuler cette opération.';
+$messages['searchsuccessful'] = '$nr message(s) trouvé(s).';
 $messages['contactsearchsuccessful'] = '$nr contact(s) trouvé(s).';
-$messages['searchnomatch'] = 'La recherche ne donne aucun résultat';
-$messages['searching'] = 'En cours de recherche...';
-$messages['checking'] = 'Vérification...';
-$messages['nospellerrors'] = 'Aucune faute trouvée';
-$messages['folderdeleted'] = 'Dossier effacé';
-$messages['foldersubscribed'] = 'Le dossier a bien été inscrit';
-$messages['folderunsubscribed'] = 'Le dossier a bien été désinscrit';
-$messages['folderpurged'] = 'Le dossier a bien été vidé';
-$messages['folderexpunged'] = 'Le dossier a bien été compacté';
-$messages['deletedsuccessfully'] = 'Supprimé(s) avec succès';
+$messages['searchnomatch'] = 'La recherche n\'a donné aucun résultat.';
+$messages['searching'] = 'Recherche en cours...';
+$messages['checking'] = 'Vérification en cours...';
+$messages['nospellerrors'] = 'Aucune faute d\'orthographe trouvée.';
+$messages['folderdeleted'] = 'Le dossier a bien été effacé.';
+$messages['foldersubscribed'] = 'Le dossier a bien été inscrit.';
+$messages['folderunsubscribed'] = 'Le dossier a bien été désinscrit.';
+$messages['folderpurged'] = 'Le dossier a bien été vidé.';
+$messages['folderexpunged'] = 'Le dossier a bien été compacté.';
+$messages['deletedsuccessfully'] = 'Correctement supprimé(s).';
 $messages['converting'] = 'Suppression de la mise en forme...';
-$messages['messageopenerror'] = 'Impossible de charger le message depuis serveur';
+$messages['messageopenerror'] = 'Impossible de charger le message depuis serveur.';
 $messages['fileuploaderror'] = 'Transfert du fichier échoué';
-$messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size';
-$messages['copysuccess'] = 'Succès de la copie des $nr adresses';
-$messages['copyerror'] = 'Ne peut pas copier les adresses';
-$messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule';
-$messages['errorsavingcontact'] = 'Ne peut pas enregistrer l\'adresse du contact';
-$messages['movingmessage'] = 'Déplacement du message...';
-$messages['copyingmessage'] = 'Copie du message ...';
-$messages['copyingcontact'] = 'Copie des contacts ...';
-$messages['deletingmessage'] = 'Suppression des messages...';
-$messages['markingmessage'] = 'Marquage des messages...';
-$messages['addingmember'] = 'Ajout des contacts dans le groupe ...';
-$messages['removingmember'] = 'Suppression des contacts du groupe ...';
-$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
-$messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
-$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identités ?';
+$messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size.';
+$messages['copysuccess'] = '$nr contacts correctement copiés.';
+$messages['movesuccess'] = '$nr contacts correctement  déplacés.';
+$messages['copyerror'] = 'Aucun contact n\'a pu être copié.';
+$messages['moveerror'] = 'Aucun contact n\'a pu être déplacé.';
+$messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule.';
+$messages['errorsavingcontact'] = 'Impossible de sauvegarder l\'adresse du contact.';
+$messages['movingmessage'] = 'Message(s) en cours de déplacement...';
+$messages['copyingmessage'] = 'Message(s) en cours de copie...';
+$messages['copyingcontact'] = 'Contact(s) en cours de copie...';
+$messages['movingcontact'] = 'Contact(s) en cours de déplacement...';
+$messages['deletingmessage'] = 'Message(s) en cours de suppression...';
+$messages['markingmessage'] = 'Message(s) en cours de marquage...';
+$messages['addingmember'] = 'Contact(s) en cours d\'ajout dans le groupe...';
+$messages['removingmember'] = 'Contact(s) en cours de suppression du groupe...';
+$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé.';
+$messages['errorsendingreceipt'] = 'Impossible d\'envoyer l\'accusé de réception.';
+$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identité ?';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
-$messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit';
-$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à envoyer';
-$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné';
-$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe';
-$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe';
+$messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit.';
+$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à transférer.';
+$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné.';
+$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe.';
+$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe.';
 $messages['nogroupassignmentschanged'] = 'Appartenance aux groupes inchangée.';
-$messages['importwait'] = 'Importation, veuillez patienter...';
-$messages['importformaterror'] = 'Echec de l\'import ! Le fichier n\'est pas un fichier d\'import de données valide.';
-$messages['importconfirm'] = '<b>$inserted contacts importés avec succès, $skipped entrées existantes ignorées</b>:<p><em>$names</em></p>';
+$messages['importwait'] = 'Import en cours, veuillez patienter...';
+$messages['importformaterror'] = 'L\'import a échoué ! Le fichier transféré n\'est pas un fichier d\'import de données valide.';
+$messages['importconfirm'] = '<b>Les $inserted contacts ont bien été importés</b>';
 $messages['importconfirmskipped'] = '<b>$skipped entrée(s) déjà existante(s)</b>';
+$messages['importmessagesuccess'] = 'Importation de $nr messages avec succès';
+$messages['importmessageerror'] = 'L\'importation a échoué! Le fichier envoyé n\'est pas un message valide ou un fichier au format mailbox';
 $messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
-$messages['nofromaddress'] = 'Il manque une adresse e-mail dans l\'identité sélectionnée';
-$messages['editorwarning'] = 'Passer à l\'éditeur texte seul causera la perte du formatage du texte. Voulez-vous continuer ?';
+$messages['nofromaddress'] = 'Courriel manquant dans l\'identité sélectionnée.';
+$messages['editorwarning'] = 'Passer à l\'éditeur de texte brut causera la perte du formatage du texte. Souhaitez-vous continuer ?';
 $messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pu être envoyé.</b>';
-$messages['smtpconnerror'] = 'Erreur SMTP ($code): Echec de la connexion au serveur';
-$messages['smtpautherror'] = 'Erreur SMTP ($code): Echec de l\'authentification';
-$messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from" ($msg)';
-$messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destinataire "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Erreur SMTP: Impossible de lire la liste des destinataires';
-$messages['smtperror'] = 'Erreur SMTP: $msg';
-$messages['emailformaterror'] = 'Adresse email incorrecte: $email';
+$messages['smtpconnerror'] = 'Erreur SMTP ($code) : Échec de la connexion au serveur.';
+$messages['smtpautherror'] = 'Erreur SMTP ($code) : Échec de l\'authentification.';
+$messages['smtpfromerror'] = 'Erreur SMTP ($code) : Impossible de définir l\'expéditeur "$from" ($msg)';
+$messages['smtptoerror'] = 'Erreur SMTP ($code) : Impossible d\'ajouter le destinataire "$to" ($msg)';
+$messages['smtprecipientserror'] = 'Erreur SMTP : Impossible de lire la liste des destinataires.';
+$messages['smtperror'] = 'Erreur SMTP : $msg';
+$messages['emailformaterror'] = 'Courriel incorrect : $email';
 $messages['toomanyrecipients'] = 'Trop de destinataires. Réduisez leur nombre à $max maximum.';
 $messages['maxgroupmembersreached'] = 'Le nombre de membres du groupe dépasse le maximum de $max.';
-$messages['internalerror'] = 'Une erreur interne est survenue. Merci de réessayer';
-$messages['contactdelerror'] = 'Les contacts n\'ont pas pu être supprimés';
-$messages['contactdeleted'] = 'Les contacts ont bien été supprimés';
-$messages['contactrestoreerror'] = 'Impossible de restaurer les contacts supprimés.';
-$messages['contactrestored'] = 'Les contacts ont bien été restaurés.';
-$messages['groupdeleted'] = 'Le groupe a bien été supprimé';
-$messages['grouprenamed'] = 'Le groupe a bien été renommé';
-$messages['groupcreated'] = 'Le groupe a bien été créé';
+$messages['internalerror'] = 'Une erreur interne est apparue. Merci de ré-essayer.';
+$messages['contactdelerror'] = 'Impossible de supprimer le(s) contact(s).';
+$messages['contactdeleted'] = 'Contact(s) correctement supprimé(s).';
+$messages['contactrestoreerror'] = 'Impossible de restaurer le(s) contact(s) supprimé(s).';
+$messages['contactrestored'] = 'Contact(s) correctement restauré(s).';
+$messages['groupdeleted'] = 'Le groupe a bien été supprimé.';
+$messages['grouprenamed'] = 'Le groupe a bien été renommé.';
+$messages['groupcreated'] = 'Le groupe a bien été créé.';
 $messages['savedsearchdeleted'] = 'La recherche enregistrée a bien été supprimée.';
 $messages['savedsearchdeleteerror'] = 'Impossible de supprimer la recherche enregistrée.';
-$messages['savedsearchcreated'] = 'La recherche enregistrée a bien été crée.';
+$messages['savedsearchcreated'] = 'La recherche enregistrée a bien été créée.';
 $messages['savedsearchcreateerror'] = 'Impossible de créer la recherche enregistrée.';
-$messages['messagedeleted'] = 'Les messages ont bien été supprimés';
-$messages['messagemoved'] = 'Les messages ont bien été déplacés';
-$messages['messagecopied'] = 'Les messages ont bien été copiés';
-$messages['messagemarked'] = 'Les messages ont bien été marqués';
-$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion';
-$messages['autocompletemore'] = 'Plusieurs entrées trouvées. Tapez plus de caractères.';
-$messages['namecannotbeempty'] = 'Le nom ne peut pas être vide';
-$messages['nametoolong'] = 'Le nom est trop long';
-$messages['folderupdated'] = 'Le dossier a bien été mis à jour';
-$messages['foldercreated'] = 'Le dossier a bien été créé';
-$messages['invalidimageformat'] = 'Format d\'image invalide';
+$messages['messagedeleted'] = 'Message(s) correctement supprimé(s).';
+$messages['messagemoved'] = 'Message(s) correctement déplacé(s).';
+$messages['messagecopied'] = 'Message(s) correctement copié(s).';
+$messages['messagemarked'] = 'Message(s) correctement marqué(s).';
+$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion.';
+$messages['autocompletemore'] = 'Plusieurs entrées trouvées. Veuillez taper plus de caractères.';
+$messages['namecannotbeempty'] = 'Le nom ne peut pas être vide.';
+$messages['nametoolong'] = 'Le nom est trop long.';
+$messages['folderupdated'] = 'Le dossier a bien été mis à jour.';
+$messages['foldercreated'] = 'Le dossier a bien été créé.';
+$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 5ffd906eb..dc1e57969 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -15,66 +15,32 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Ûnderwerp';
 $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['size']    = 'Size';
-$labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisaasje';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'Mappen';
-$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['open']     = 'Open';
 $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';
@@ -82,8 +48,6 @@ $labels['wed'] = 'woa';
 $labels['thu'] = 'toa';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'sno';
-
-// weekdays long
 $labels['sunday']    = 'snein';
 $labels['monday']    = 'moandei';
 $labels['tuesday']   = 'tiisdei';
@@ -91,8 +55,6 @@ $labels['wednesday'] = 'woansdei';
 $labels['thursday']  = 'tongersdei';
 $labels['friday']    = 'freed';
 $labels['saturday']  = 'sneon';
-
-// months short
 $labels['jan']	= 'jan';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mrt';
@@ -105,8 +67,6 @@ $labels['sep']	= 'sep';
 $labels['oct']	= 'okt';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'des';
-
-// months long
 $labels['longjan']	= 'jannewaris';
 $labels['longfeb']	= 'febrewaris';
 $labels['longmar']	= 'maart';
@@ -119,425 +79,8 @@ $labels['longsep']	= 'septimber';
 $labels['longoct']	= 'oktober';
 $labels['longnov']	= 'novimber';
 $labels['longdec']	= 'desimber';
-
 $labels['today'] = 'Hjoed';
-
-// 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['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
-$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['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['listgroup'] = 'List group members';
-$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['showemail'] = 'Show email address with display name';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$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/fy_NL/messages.inc b/program/localization/fy_NL/messages.inc
index 16f4c67bf..da4e39679 100644
--- a/program/localization/fy_NL/messages.inc
+++ b/program/localization/fy_NL/messages.inc
@@ -15,159 +15,4 @@
 
  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'] = 'Your browser does not accept cookies.';
-$messages['sessionerror'] = 'Your session is invalid or expired.';
-$messages['storageerror'] = 'Connection to storage server failed.';
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = '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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 9fffaf42a..dc33d008d 100755..100644
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -15,66 +15,40 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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í';
-
-// mailbox names
 $labels['inbox']  = 'Isteach';
 $labels['drafts'] = 'Dréachtaí';
 $labels['sent']   = 'Amach';
 $labels['trash']  = 'Bosca bruscair';
 $labels['junk']   = 'Dramhaíl';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Ábhair';
 $labels['from']    = 'Seolaí';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Faighteoir';
 $labels['cc']      = 'Cóipeáil';
 $labels['bcc']     = 'Cóip cheilte';
 $labels['replyto'] = 'Freagair go';
-$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['messagesfromto'] = 'Teachtaireachta as $from go $to as $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Teachtaireacht $nr as $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'Cóipeáil';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
-$labels['open']     = 'Open';
-$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';
@@ -82,8 +56,6 @@ $labels['wed'] = 'Ch';
 $labels['thu'] = 'Dé';
 $labels['fri'] = 'Ao';
 $labels['sat'] = 'Sa';
-
-// weekdays long
 $labels['sunday']    = 'Domhnach';
 $labels['monday']    = 'An Luan';
 $labels['tuesday']   = 'An Mháirt';
@@ -91,8 +63,6 @@ $labels['wednesday'] = 'An Chéadaoin';
 $labels['thursday']  = 'An Déardaoin';
 $labels['friday']    = 'Aoine';
 $labels['saturday']  = 'An Satharn';
-
-// months short
 $labels['jan']	= 'Ean';
 $labels['feb']	= 'Fea';
 $labels['mar']	= 'Már';
@@ -101,12 +71,8 @@ $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';
@@ -119,25 +85,15 @@ $labels['longsep']	= 'Meán Fómhair';
 $labels['longoct']	= 'Deireadh Fómhair';
 $labels['longnov']	= 'Samhain';
 $labels['longdec']	= 'Nollag';
-
 $labels['today'] = 'Inniu';
-
-// 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['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';
@@ -145,399 +101,92 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Toilleadh diosca atá athláimhe';
 $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['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'Iatání';
 $labels['upload'] = 'Aistriú suas';
-$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['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['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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
 $labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$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['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['listgroup'] = 'List group members';
 $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['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['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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$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['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 b837c9d16..b52fbe657 100755..100644
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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...';
@@ -48,129 +32,38 @@ $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['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['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['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['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í';
 $messages['fileuploaderror'] = 'Theip an suas-luchtú';
 $messages['filesizeerror'] = 'Beigh an comhad ró-mhor. Is ea $size uas-saghas chun admháil léite';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 c624c462e..780d47d77 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Cubo do lixo';
 $labels['junk']   = 'Correo lixo';
 $labels['show_real_foldernames'] = 'Amosar nomes reáis para cartafois especiáis';
-
-// message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
 $labels['sender']  = 'Remitente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Estado da lectura';
 $labels['listoptions'] = 'Opcións de lista...';
-
 $labels['mailboxlist'] = '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['fromtoshort'] = '$from - $to de $count';
-
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Amosar';
 $labels['showanyway'] = 'Amosala de tódolos xeitos';
-
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mér';
 $labels['thu'] = 'Xov';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sáb';
-
-// weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Luns';
 $labels['tuesday']   = 'Martes';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mércores';
 $labels['thursday']  = 'Xoves';
 $labels['friday']    = 'Venres';
 $labels['saturday']  = 'Sábado';
-
-// months short
 $labels['jan']	= 'Xan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Set';
 $labels['oct']	= 'Out';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Xaneiro';
 $labels['longfeb']	= 'Febreiro';
 $labels['longmar']	= 'Marzo';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Setembro';
 $labels['longoct']	= 'Outubro';
 $labels['longnov']	= 'Novembro';
 $labels['longdec']	= 'Decembro';
-
 $labels['today'] = 'Hoxe';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Procurar novas mensaxes';
 $labels['compose']          = 'Redactar unha mensaxe';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,22 @@ $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['importmessages'] = 'Importar mensaxes';
-
 $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['body']  = 'Corpo';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
 $labels['changeformattext'] = 'Amosar en texto plano';
 $labels['changeformathtml'] = 'Amosar en HTML';
-
-// message compose
 $labels['editasnew']      = 'Editar como nova';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar a mensaxe agora';
@@ -224,26 +190,22 @@ $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['spellcheck']    = 'Ortografía';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
 $labels['revertto']      = 'Voltar a';
-
 $labels['attach'] = 'Anexar';
 $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['highest'] = 'A máis alta';
-
 $labels['nosubject']  = '(Sen asunto)';
 $labels['showimages'] = 'Amosar as imaxes';
 $labels['alwaysshow'] = 'Amosar sempre as imaxes nas mensaxes de $sender';
@@ -251,25 +213,19 @@ $labels['isdraft']    = 'Esta mensaxe é un borrador';
 $labels['andnmore']   = '$nr máis...';
 $labels['togglemoreheaders'] = 'Amosar máis cabecerias';
 $labels['togglefullheaders'] = 'Conmutar cabeceiras en bruto';
-
 $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.';
-
-// address boook
 $labels['name']         = 'Nome completo';
 $labels['firstname']    = 'Nome';
 $labels['surname']      = 'Apelidos';
@@ -304,7 +260,6 @@ $labels['search'] = 'Procurar';
 $labels['advsearch'] = 'Procura avanzada';
 $labels['advanced'] = 'Avanzado';
 $labels['other'] = 'Outro';
-
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Traballo';
 $labels['typeother']  = 'Outro';
@@ -319,14 +274,12 @@ $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['cancel'] = 'Cancelar';
 $labels['save']   = 'Gardar';
@@ -335,7 +288,6 @@ $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';
@@ -349,42 +301,31 @@ $labels['newcontactgroup'] = 'Crear novo grupo de contactos';
 $labels['grouprename']    = 'Mudar o nome do grupo';
 $labels['groupdelete']    = 'Borrar o grupo';
 $labels['groupremoveselected'] = 'Eliminar do grupo os contactos seleccionados';
-
 $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['listgroup'] = 'List group members';
 $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'] = 'Pode cargar contactos desde un caderno de enderezos preexistente.<br/>Pódense importar enderezos en formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por comas)';
 $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';
@@ -480,7 +421,6 @@ $labels['standardwindows'] = 'Manexar avisos emerxentes como xanelas estándar';
 $labels['forwardmode'] = 'Reenvio de mensaxes';
 $labels['inline'] = 'inserido';
 $labels['asattachment'] = 'coma anexo';
-
 $labels['folder']  = 'Cartafol';
 $labels['folders']  = 'Cartafoles';
 $labels['foldername']  = 'Nome do cartafol';
@@ -501,26 +441,20 @@ $labels['foldertype'] = 'Tipo do cartafol';
 $labels['personalfolder']  = 'Cartafol privado';
 $labels['otherfolder']  = 'Cartafol de outro usuario';
 $labels['sharedfolder']  = 'Cartafol público';
-
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
-
 $labels['installedplugins'] = 'Complementos instalados';
 $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';
@@ -539,5 +473,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 8fc2cb424..599f2ce41 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Ocurreu un erro!';
 $messages['loginfailed']  = 'O contrasinal ou o nome de usuario son incorrectos.';
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Non se atopou o contacto solicitado.';
 $messages['contactsearchonly'] = 'Introduza algún termo para atopar contactos';
 $messages['sendingfailed'] = 'Fallou o envío da mensaxe.';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundos antes de enviar esta mensaxe.';
-$messages['errorsavingsent'] = 'Ocurriu un erro mentres se gardaba a mensaxe enviada.';
-$messages['errorsaving'] = 'Ocurriu un erro mentres se gardaba.';
 $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).';
@@ -101,8 +97,6 @@ $messages['converting'] = 'Eliminando o formato da mensaxe...';
 $messages['messageopenerror'] = 'Non foi posible cargar a mensaxe desde o servidor.';
 $messages['fileuploaderror'] = 'Fallou a carga do ficheiro.';
 $messages['filesizeerror'] = 'O ficheiro cargado é máis grande que o tamaño máximo de $size.';
-$messages['copysuccess'] = 'Copiáronse correctamente $nr enderezos.';
-$messages['copyerror'] = 'Non foi posible copiar ningún enderezo.';
 $messages['sourceisreadonly'] = 'A orixe é de só lectura.';
 $messages['errorsavingcontact'] = 'Non foi posible gardar o contacto.';
 $messages['movingmessage'] = 'Movendo a(s) mensaxe(s)...';
@@ -141,7 +135,6 @@ $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email.';
 $messages['toomanyrecipients'] = 'Especificou destinatarios de máis. Por favor, redúzaos a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max.';
-$messages['internalerror'] = 'Ocurriu un erro interno. Por favor, probe outra vez.';
 $messages['contactdelerror'] = 'Non foi posible eliminar o(s) contacto(s).';
 $messages['contactdeleted'] = 'Borráronse correctamente o(s) contacto(s).';
 $messages['contactrestoreerror'] = 'Non foi posible restaurar o(s) contacto(s) borrado(s).';
@@ -169,5 +162,4 @@ $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cart
 $messages['messagetoobig'] = 'A mensaxe é demasiado grande para procesala';
 $messages['attachmentvalidationerror'] = 'ATENCIÓN! Este anexo é sospeitoso porque o seu tipo non coincide o tipo declarado na mensaxe. Se non confía no remitente, non debería abrilo, porque podería conter un virus ou malware.<br/><br/><em>Tipo agardado: $expected; Tipo detectado: $detected</em>';
 $messages['noscriptwarning'] = 'Atención: Este servicio de correo web precisa de Javascript!. Por favor, active javascript nas opción do seu navegador.';
-
 ?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 7ad04ab4a..ad9a91adc 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'ברוך בואך אל $product';
 $labels['username']  = 'שם משתמש';
 $labels['password']  = 'סיסמה';
 $labels['server']    = 'שרת';
 $labels['login']     = 'כניסה';
-
-// taskbar
 $labels['logout']   = 'יציאה';
 $labels['mail']     = 'רשימת הודעות';
 $labels['settings'] = 'הגדרות אישיות';
 $labels['addressbook'] = 'פנקס כתובות';
-
-// mailbox names
 $labels['inbox']  = 'נכנס';
 $labels['drafts'] = 'טיוטות';
 $labels['sent']   = 'נשלח';
 $labels['trash']  = 'אשפה';
 $labels['junk']   = 'זבל';
 $labels['show_real_foldernames'] = 'הצגת שמות אמיתיים של תיקיות מיוחדות';
-
-// message listing
 $labels['subject'] = 'נושא';
 $labels['from']    = 'מאת';
 $labels['sender']  = 'השולח';
@@ -54,13 +44,11 @@ $labels['priority'] = 'עדיפות';
 $labels['organization'] = 'ארגון';
 $labels['readstatus'] = 'נקרא';
 $labels['listoptions'] = 'הצגת אפשרויות...';
-
 $labels['mailboxlist'] = 'תיקיות';
 $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']   = 'תיוק ב...';
@@ -68,13 +56,9 @@ $labels['download'] = 'הורדה';
 $labels['open']     = 'לפתוח';
 $labels['showattachment'] = 'הצגה';
 $labels['showanyway'] = 'להציג בכל מקרה';
-
 $labels['filename'] = 'שם קובץ';
 $labels['filesize'] = 'גודל קובץ';
-
 $labels['addtoaddressbook'] = 'הוספה לפנקס כתובות';
-
-// weekdays short
 $labels['sun'] = 'יום א';
 $labels['mon'] = 'יום ב';
 $labels['tue'] = 'יום ג';
@@ -82,8 +66,6 @@ $labels['wed'] = 'יום ד';
 $labels['thu'] = 'יום ה';
 $labels['fri'] = 'יום ו';
 $labels['sat'] = 'יום ש';
-
-// weekdays long
 $labels['sunday']    = 'ראשון';
 $labels['monday']    = 'שני';
 $labels['tuesday']   = 'שלישי';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'רביעי';
 $labels['thursday']  = 'חמישי';
 $labels['friday']    = 'ששי';
 $labels['saturday']  = 'שבת';
-
-// months short
 $labels['jan']	= 'ינו';
 $labels['feb']	= 'פבר';
 $labels['mar']	= 'מרץ';
@@ -105,8 +85,6 @@ $labels['sep']	= 'ספט';
 $labels['oct']	= 'אוק';
 $labels['nov']	= 'נוב';
 $labels['dec']	= 'דצמ';
-
-// months long
 $labels['longjan']	= 'ינואר';
 $labels['longfeb']	= 'פברואר';
 $labels['longmar']	= 'מרץ';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'ספטמבר';
 $labels['longoct']	= 'אוקטובר';
 $labels['longnov']	= 'נובמבר';
 $labels['longdec']	= 'דצמבר';
-
 $labels['today'] = 'היום';
-
-// toolbar buttons
 $labels['refresh']          = 'רענון';
 $labels['checkmail']        = 'משיכת הודעות חדשות';
 $labels['compose']          = 'כתיבת הודעה';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'פעולות נוספות...';
 $labels['more']             = 'עוד';
 $labels['back']             = 'חזרה';
 $labels['options']          = 'אפשרויות';
-
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'הרחבה כלית';
 $labels['expand-unread'] = 'הרחבה טרם נקרא';
 $labels['collapse-all'] = 'כינוס כללי';
 $labels['threaded'] = 'משורשר';
-
 $labels['autoexpand_threads'] = 'הרחבת הודעות משורשרות';
 $labels['do_expand'] = 'כל השרשורים';
 $labels['expand_only_unread'] = 'רק עם הודעות שטרם נקראו';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'רשימת עמודות';
 $labels['listsorting'] = 'המיון לפי העמודה';
 $labels['listorder'] = 'סדר מיון';
 $labels['listmode'] = 'אופן הצגת רשימה';
-
 $labels['folderactions'] = 'פעולות על תיקים';
 $labels['compact'] = 'פינוי שטח לא מנוצל';
 $labels['empty'] = 'ריקון';
 $labels['importmessages'] = 'ייבוא הודעות';
-
 $labels['quota'] = 'ניצול קיבולת';
 $labels['unknown']  = 'לא ידוע';
 $labels['unlimited']  = 'ללא הגבלה';
-
 $labels['quicksearch']  = 'חיפוש מהיר';
 $labels['resetsearch']  = 'ניקוי תיבת החיפוש';
 $labels['searchmod']  = 'מאפייני חיפוש';
 $labels['msgtext']  = 'כל ההודעה';
 $labels['body']  = 'גוף ההודעה';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'סוג';
+$labels['namex'] = 'שם';
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
 $labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
 $labels['changeformathtml'] = 'הצגה בפורמט HTML';
-
-// message compose
 $labels['editasnew']      = 'עריכת ההודעה כחדשה';
 $labels['send']           = 'שלח';
 $labels['sendmessage']    = 'משלוח מיידי';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'אישור קבלה';
 $labels['dsn']            = 'הודעה על מצב המסירה';
 $labels['mailreplyintro'] = ':כתב $sender, $date בתאריך';
 $labels['originalmessage'] = 'הודעה מקורית';
-
 $labels['editidents']    = 'עריכת זהויות';
 $labels['spellcheck']    = 'איות';
 $labels['checkspelling'] = 'בדיקת איות';
 $labels['resumeediting'] = 'המשך עריכה';
 $labels['revertto']      = 'חזור למצב קודם';
-
 $labels['attach'] = 'צירוף';
 $labels['attachments'] = 'צרופות';
 $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
 $labels['close']  = 'סגירה';
 $labels['messageoptions']  = 'אפשרויות הודעה...';
-
 $labels['low']     = 'נמוך';
 $labels['lowest']  = 'נמוך ביותר';
 $labels['normal']  = 'רגיל';
 $labels['high']    = 'גבוה';
 $labels['highest'] = 'גבוה ביותר';
-
 $labels['nosubject']  = '(ללא נושא)';
 $labels['showimages'] = 'הצגת תמונות';
 $labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת';
@@ -251,25 +215,19 @@ $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'] = 'הערה: האישור אינו מבטיח שהנמען קרא או הבין את תוכן ההודעה.';
-
-// address boook
 $labels['name']         = 'שם להצגה';
 $labels['firstname']    = 'שם פרטי';
 $labels['surname']      = 'שם משפחה';
@@ -304,7 +262,6 @@ $labels['search'] = 'חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
 $labels['advanced'] = 'מתקדם';
 $labels['other'] = 'אחר';
-
 $labels['typehome']   = 'בית';
 $labels['typework']   = 'עבודה';
 $labels['typeother']  = 'אחר';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = 'עוזר/ת';
 $labels['typehomepage']  = 'דף הבית';
 $labels['typeblog'] = 'יומן רשת';
 $labels['typeprofile'] = 'פרופיל';
-
 $labels['addfield'] = 'הוסף שדה';
 $labels['addcontact'] = 'הוספת איש קשר';
 $labels['editcontact'] = 'עריכת איש קשר';
 $labels['contacts'] = 'אנשי קשר';
 $labels['contactproperties'] = 'מאפייני איש קשר';
 $labels['personalinfo'] = 'מידע אישי';
-
 $labels['edit']   = 'עריכה';
 $labels['cancel'] = 'ביטול';
 $labels['save']   = 'שמירה';
@@ -335,7 +290,6 @@ $labels['rename'] = 'שינוי שם';
 $labels['addphoto'] = 'הוספה';
 $labels['replacephoto'] = 'החלפה';
 $labels['uploadphoto'] = 'העלאת תמונה';
-
 $labels['newcontact']     = 'איש קשר חדש';
 $labels['deletecontact']  = 'מחיקת אנשי קשר מסומנים';
 $labels['composeto']      = 'יצירת הודעה אל';
@@ -349,44 +303,34 @@ $labels['newcontactgroup'] = 'יצירת קבוצה חדשה של אנשי קש�
 $labels['grouprename']    = 'שינוי שם קבוצה';
 $labels['groupdelete']    = 'מחיקת קבוצה';
 $labels['groupremoveselected'] = 'אנשי הקשר שנבחרו יוסרו מהקבוצה';
-
 $labels['previouspage']   = 'הצגת הקבוצה הקודמת';
 $labels['firstpage']      = 'הצגת הקבוצה הראשונה';
 $labels['nextpage']       = 'הצגת הקבוצה הבאה';
 $labels['lastpage']       = 'הצגת הקבוצה האחרונה';
-
 $labels['group'] = 'קבוצה';
 $labels['groups'] = 'קבוצות';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'רשימה של חברי קבוצה';
 $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';
@@ -482,7 +426,6 @@ $labels['standardwindows'] = 'חלונות קופצים יטופלו כחלונ�
 $labels['forwardmode'] = 'הפנית הודעות';
 $labels['inline'] = 'חלק מההודעה';
 $labels['asattachment'] = 'כצרופה';
-
 $labels['folder']  = 'תיק';
 $labels['folders']  = 'תיקיות';
 $labels['foldername']  = 'שם תיק';
@@ -503,26 +446,20 @@ $labels['foldertype'] = 'סוג תיקיה';
 $labels['personalfolder']  = 'תיקיה פרטית';
 $labels['otherfolder']  = 'תיקית משתמש נוספת';
 $labels['sharedfolder']  = 'תיקיה ציבורית';
-
 $labels['sortby'] = 'מיון לפי';
 $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'] = 'מערב אירופי';
@@ -541,5 +478,4 @@ $labels['vietnamese'] = 'וויטנאמי';
 $labels['japanese'] = 'יפני';
 $labels['korean'] = 'קוריאני';
 $labels['chinese'] = 'סיני';
-
 ?>
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 37ebcea01..b7e7d1ae8 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'קרתה שגיאה !';
 $messages['loginfailed']  = 'הכניסה נכשלה';
 $messages['cookiesdisabled'] = 'הדפדפן אינו מקבל עוגיות';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'איש הקשר המבוקש לא נמצא';
 $messages['contactsearchonly'] = 'יש להקיש מפתחות חיפוש כדי למצוא אנשי קשר';
 $messages['sendingfailed'] = 'שליחת ההודעה נכשלה';
 $messages['senttooquickly'] = 'נא להמתין $sec שניות לפני מסירת הודעה זו';
-$messages['errorsavingsent'] = 'נגרמה שגיאה במהלך שמירת ההודעה בתיק הודעות יוצאות';
-$messages['errorsaving'] = 'נגרמה שגיאה במהלך השמירה';
 $messages['errormoving'] = 'לא ניתן לתייק את ההודעה';
 $messages['errorcopying'] = 'העתקת ההודעות נכשלה';
 $messages['errordeleting'] = 'לא ניתן למחוק את ההודעה';
@@ -101,13 +97,16 @@ $messages['converting'] = 'הסרת העיצוב מההודעה';
 $messages['messageopenerror'] = 'לא ניתן לטעון ההודעה מהשרת';
 $messages['fileuploaderror'] = 'העלאת הקובץ נכשלה';
 $messages['filesizeerror'] = 'הקובץ לטעינה גדול מהגודל המקסימלי שהוא $size';
-$messages['copysuccess'] = '$nr כתובות הועתקו בהצלחה';
-$messages['copyerror'] = 'לא ניתן להעתיק אף כתובת';
+$messages['copysuccess'] = '$nr אנשי קשר הועתקו בהצלחה';
+$messages['movesuccess'] = '$nr אנשי קשר הועברו בהצלחה';
+$messages['copyerror'] = 'לא ניתן היה להעתיק אנשי קשר כלשהם';
+$messages['moveerror'] = 'לא ניתן היה להעביר אנשי קשר כלשהם';
 $messages['sourceisreadonly'] = 'המקור לכתובת הוא לקריאה בלבד';
 $messages['errorsavingcontact'] = 'לא ניתן לשמור את כתובת איש הקשר';
 $messages['movingmessage'] = 'תיוק ההודעה...';
 $messages['copyingmessage'] = 'הודעת מועתקת...';
 $messages['copyingcontact'] = 'העתקת אנשי קשר...';
+$messages['movingcontact'] = 'אנשי קשר עוברים...';
 $messages['deletingmessage'] = 'המחיקה בתהליך...';
 $messages['markingmessage'] = 'סימון ההודעה בתהליך...';
 $messages['addingmember'] = 'הוספת אנשי קשר לקבוצה...';
@@ -141,7 +140,6 @@ $messages['smtperror'] = 'SMTP: $msg';
 $messages['emailformaterror'] = '$email  כתובת דוא"ל שגויה';
 $messages['toomanyrecipients'] = 'יותר מדי נמענים. יש להקטין מספרם ל - $max';
 $messages['maxgroupmembersreached'] = 'מספרם של חברי הקבוצה אינו יכול לעבור $max';
-$messages['internalerror'] = 'שגיאת מערכת. נא לנסות שנית';
 $messages['contactdelerror'] = 'לא ניתן למחוק איש קשר';
 $messages['contactdeleted'] = 'איש הקשר נמחק';
 $messages['contactrestoreerror'] = 'לא ניתן לשחזר איש קשר שנמחק';
@@ -169,5 +167,4 @@ $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 303e0b5fb..a8b684c56 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product में स्वागत है';
 $labels['username']  = 'यूसरनाम';
 $labels['password']  = 'पासवर्ड';
 $labels['server']    = 'सर्वर';
 $labels['login']     = 'लॉगिन';
-
-// taskbar
 $labels['logout']   = 'लॉगआऊट';
 $labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'निजी सैटिंग';
 $labels['addressbook'] = 'पता खाता';
-
-// mailbox names
 $labels['inbox']  = 'इनबॉक्स';
 $labels['drafts'] = 'ड्राफ़ट';
 $labels['sent']   = 'भेजा गया';
 $labels['trash']  = 'रद्दी';
 $labels['junk']   = 'स्पैम';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'विशय';
 $labels['from']    = 'भेजने वाला';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'पाने वाला';
 $labels['cc']      = 'कार्बन';
 $labels['bcc']     = 'अंधा कार्बन';
@@ -52,29 +40,16 @@ $labels['date']    = 'तारीख';
 $labels['size']    = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'कार्बन';
 $labels['move']     = 'स्थानांतरित करें';
 $labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
-
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
-
-// weekdays short
 $labels['sun'] = 'रवि';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंग';
@@ -82,8 +57,6 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनि';
-
-// weekdays long
 $labels['sunday']    = 'रविवार';
 $labels['monday']    = 'सोमवार';
 $labels['tuesday']   = 'मंगलवार';
@@ -91,8 +64,6 @@ $labels['wednesday'] = 'बुधवार';
 $labels['thursday']  = 'गुरुवार';
 $labels['friday']    = 'शुक्रवार';
 $labels['saturday']  = 'शनिवार';
-
-// months short
 $labels['jan']	= 'जनवरी';
 $labels['feb']	= 'फ़रवरी';
 $labels['mar']	= 'मार्च';
@@ -100,13 +71,6 @@ $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']	= 'मार्च';
@@ -119,10 +83,7 @@ $labels['longsep']	= 'सितंबर';
 $labels['longoct']	= 'अक्टूबर';
 $labels['longnov']	= 'नवम्बर';
 $labels['longdec']	= 'दिसंबर';
-
 $labels['today'] = 'आज';
-
-// toolbar buttons
 $labels['refresh']          = 'ताज़ा करें';
 $labels['checkmail']        = 'नये मेल लाऐं';
 $labels['compose']          = 'मेल लिखें';
@@ -130,14 +91,9 @@ $labels['writenewmessage']  = 'मेल लिखें';
 $labels['reply']            = 'जवाब';
 $labels['replytomessage']   = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$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']     = 'पहला मेल दिखाऐं';
@@ -146,398 +102,90 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'अनदेखी';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'डिस्क उपयोग';
 $labels['unknown']  = 'अज्ञात';
 $labels['unlimited']  = 'असीम';
-
 $labels['quicksearch']  = 'तेज़ खोज';
 $labels['resetsearch']  = 'खोज खाली करें';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'जुडे फाईल';
 $labels['upload'] = 'अपलोड';
-$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['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'] = '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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'सम्पाद';
 $labels['cancel'] = 'रद्द';
 $labels['save']   = 'सहेज';
 $labels['delete'] = 'मिटा';
-$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['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['listgroup'] = 'List group members';
-$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['autodetect']  = 'Auto';
 $labels['language']  = 'भाषा';
 $labels['timezone']  = 'समय क्षेत्र';
 $labels['pagesize']  = 'हर पन्ने पर इतने';
 $labels['signature'] = 'दस्तखत';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'झलक पट्टी दिखाऐं';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$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['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 ffbc6f436..9cf02696a 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = 'मेल भेजा जा रहा है...';
@@ -48,129 +32,35 @@ $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['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['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['nopagesizewarning'] = 'पन्ना माप भरें';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
 $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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 4578fed2b..70d1c1316 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Pristigla pošta';
 $labels['drafts'] = 'Predlošci';
 $labels['sent']   = 'Poslano';
 $labels['trash']  = 'Smeće';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Naslov';
 $labels['from']    = 'Od';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Za';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -53,28 +41,18 @@ $labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Pročitano';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = '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['download'] = 'Preuzmi (download)';
-$labels['open']     = 'Open';
-$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';
@@ -82,8 +60,6 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-
-// weekdays long
 $labels['sunday']    = 'Nedjelja';
 $labels['monday']    = 'Ponedjeljak';
 $labels['tuesday']   = 'Utorak';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'Srijeda';
 $labels['thursday']  = 'Četvrtak';
 $labels['friday']    = 'Petak';
 $labels['saturday']  = 'Subota';
-
-// months short
 $labels['jan']	= 'Sij';
 $labels['feb']	= 'Velj';
 $labels['mar']	= 'Ožu';
@@ -105,8 +79,6 @@ $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';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'Rujan';
 $labels['longoct']	= 'Listopad';
 $labels['longnov']	= 'Studeni';
 $labels['longdec']	= 'Prosinac';
-
 $labels['today'] = 'Danas';
-
-// toolbar buttons
 $labels['refresh']          = 'Osvježi';
 $labels['checkmail']        = 'Provjera novih poruka';
 $labels['compose']          = 'Nova poruka';
@@ -155,7 +124,6 @@ $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';
@@ -163,9 +131,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
 $labels['unanswered'] = 'Neodgovrene';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Obrisano';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
 $labels['filter'] = 'Filtriraj';
 $labels['list'] = 'Lista';
@@ -174,7 +140,6 @@ $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';
@@ -190,31 +155,19 @@ $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['importmessages'] = 'Import messages';
-
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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';
@@ -224,52 +177,39 @@ $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['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Povratak u pisanje';
 $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['highest'] = 'Najviši';
-
 $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['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.';
-
-// address boook
 $labels['name']         = 'Puno ime';
 $labels['firstname']    = 'Ime';
 $labels['surname']      = 'Prezime';
@@ -304,7 +244,6 @@ $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna Pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-
 $labels['typehome']   = 'Kućni broj';
 $labels['typework']   = 'Poslovni broj';
 $labels['typeother']  = 'Ostalo';
@@ -319,14 +258,12 @@ $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['cancel'] = 'Odustani';
 $labels['save']   = 'Spremi';
@@ -334,62 +271,43 @@ $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Smijeniti';
-$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['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['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['listgroup'] = 'List group members';
 $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';
@@ -400,13 +318,9 @@ $labels['timezone']  = 'Vremenska zona';
 $labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaži područje pregleda';
 $labels['skin'] = 'Tema izgleda';
 $labels['logoutclear'] = 'Očisti smeće pri izlazu';
@@ -424,14 +338,12 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nikada';
 $labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
@@ -447,13 +359,11 @@ $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';
@@ -466,21 +376,13 @@ $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['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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Mapa';
 $labels['folders']  = 'Mape';
 $labels['foldername']  = 'Ime mape';
@@ -501,26 +403,19 @@ $labels['foldertype'] = 'Vrsta mape';
 $labels['personalfolder']  = 'Privatna mapa';
 $labels['otherfolder']  = 'Mapa drugih korisnika';
 $labels['sharedfolder']  = 'Javna mapa';
-
 $labels['sortby'] = 'Sortiraj po';
 $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';
@@ -539,5 +434,4 @@ $labels['vietnamese'] = 'Vijetnamski';
 $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 0b96c97f2..2e51848eb 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -15,9 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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';
@@ -25,17 +22,12 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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...';
@@ -56,8 +48,6 @@ $messages['contactnotfound'] = 'Traženi kontakt nije pronađen';
 $messages['contactsearchonly'] = 'Upišite nekoliko pojmova za pretragu imenika';
 $messages['sendingfailed'] = 'Greška pri slanju poruke';
 $messages['senttooquickly'] = 'Molimo sačekajte $sec sek. prije slanja ove poruke';
-$messages['errorsavingsent'] = 'Greška pri spremanju poslane poruke';
-$messages['errorsaving'] = 'Greška pri spremanju';
 $messages['errormoving'] = 'Greška pri premještanju poruke';
 $messages['errorcopying'] = 'Greška pri kopiranju poruke';
 $messages['errordeleting'] = 'Greška pri brisanju poruke';
@@ -101,16 +91,11 @@ $messages['converting'] = 'Formatiranje poruke';
 $messages['messageopenerror'] = 'Učitavanje poruke nije uspjelo';
 $messages['fileuploaderror'] = 'Prijenos datoteke nije uspio';
 $messages['filesizeerror'] = 'Datoteka je prevelika. Maksimalna veličina je $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Ovaj resurs adresa je samo za čitanje';
 $messages['errorsavingcontact'] = 'Nije uspjelo spremanje adrese kontakta';
 $messages['movingmessage'] = 'Premještanje poruke...';
 $messages['copyingmessage'] = 'Kopiranje poruke...';
 $messages['copyingcontact'] = 'Kopiram kontakt(e)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Brisanje poruke...';
 $messages['markingmessage'] = 'Označavanje poruke...';
 $messages['addingmember'] = 'Dodajem kontakt(e) u grupu...';
@@ -124,13 +109,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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
 $messages['nofromaddress'] = 'Nije upisana e-mail adresa u odabrani identitet';
 $messages['editorwarning'] = 'Prebacivanje u čisti tekstualni uređivač će prouzrokovati gubljenje formatiranje teksta. Želite li nastaviti?';
@@ -144,7 +125,6 @@ $messages['smtperror'] = 'SMTP Greška: $msg';
 $messages['emailformaterror'] = 'Nepravilna e-mail adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primatelja. Smanjite broj primatelja na $max.';
 $messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi preko maximuma od $max';
-$messages['internalerror'] = 'Dogodila se interna greška. Molimo Vas pokušajte ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
 $messages['contactdeleted'] = 'Kontakti uspješno obrisani.';
 $messages['contactrestoreerror'] = 'Ne mogu vratiti obrisan(e) kontakt(e).';
@@ -170,7 +150,4 @@ $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 5e09df163..648ac759f 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// 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['show_real_foldernames'] = 'Az valós nevek megjelenítése a speciális mappáknál.';
-
-// message listing
 $labels['subject'] = 'Tárgy';
 $labels['from']    = 'Feladó';
 $labels['sender']  = 'Feladó';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Sürgősség';
 $labels['organization'] = 'Szervezet';
 $labels['readstatus'] = 'Olvasott';
 $labels['listoptions'] = 'Üzenetlista beállítások...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'letöltés';
 $labels['open']     = 'Megnyítá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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Szer';
 $labels['thu'] = 'Csüt';
 $labels['fri'] = 'Pén';
 $labels['sat'] = 'Szom';
-
-// weekdays long
 $labels['sunday']    = 'Vasárnap';
 $labels['monday']    = 'Hétfő';
 $labels['tuesday']   = 'Kedd';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Szerda';
 $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';
@@ -105,8 +85,6 @@ $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';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Szeptember';
 $labels['longoct']	= 'Október';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'December';
-
 $labels['today'] = 'Ma';
-
-// toolbar buttons
 $labels['refresh']          = 'Frissítés';
 $labels['checkmail']        = 'Új üzenetek ellenőrzése';
 $labels['compose']          = 'Üzenet létrehozása';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $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';
@@ -190,16 +163,13 @@ $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['importmessages'] = 'Üzenetek importálása';
-
 $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';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Teljes üzenet';
 $labels['body']  = 'Törzs';
 $labels['type'] = 'Típus';
 $labels['namex'] = 'Név';
-
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
 $labels['changeformattext'] = 'Megjelenítés sima szöveges formátumban';
 $labels['changeformathtml'] = 'Megjelenítés HTML formátumban';
-
-// message compose
 $labels['editasnew']      = 'Szerkesztés újként';
 $labels['send']           = 'Küldés';
 $labels['sendmessage']    = 'Üzenet küldése';
@@ -225,26 +192,22 @@ $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['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['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['highest'] = 'Legmagasabb';
-
 $labels['nosubject']  = '(nincs tárgy)';
 $labels['showimages'] = 'Képek megjelenítése';
 $labels['alwaysshow'] = 'Képek megjelenítése mindig, ha a feladó $sender';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Ez egy piszkozat.';
 $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.';
-
-// address boook
 $labels['name']         = 'Megjelenített név';
 $labels['firstname']    = 'Keresztnév';
 $labels['surname']      = 'Vezetéknév';
@@ -305,7 +262,6 @@ $labels['search'] = 'Keresés';
 $labels['advsearch'] = 'Részletes keresés';
 $labels['advanced'] = 'Haladó';
 $labels['other'] = 'Egyéb';
-
 $labels['typehome']   = 'Otthon';
 $labels['typework']   = 'Munkahely';
 $labels['typeother']  = 'Egyéb';
@@ -320,14 +276,12 @@ $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['cancel'] = 'Mégsem';
 $labels['save']   = 'Mentés';
@@ -336,7 +290,6 @@ $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';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Új csoport';
 $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['group'] = 'Csoport';
 $labels['groups'] = 'Csoportok';
 $labels['listgroup'] = 'Csoport tagjainak listája';
 $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:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Mind(csoport létrehozása amennyiben szükséges)
 $labels['importgroupsexisting'] = 'Csak már létező csoportoknak';
 $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';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'A felugró ablakok használata szokásos ablakkén
 $labels['forwardmode'] = 'Üzenet továbbítás';
 $labels['inline'] = 'beágyazott';
 $labels['asattachment'] = 'csatolmányként';
-
 $labels['folder']  = 'Mappa';
 $labels['folders']  = 'Mappák';
 $labels['foldername']  = 'Mappa neve';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Mappa típusa';
 $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['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';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnámi';
 $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 d54589f42..3ca87a52f 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'A kiválasztott kapcsolat nem található';
 $messages['contactsearchonly'] = 'Adjon meg keresőkifejezéseket a kapcsolatok közti kereséshez';
 $messages['sendingfailed'] = 'Az üzenet elküldése nem sikerült';
 $messages['senttooquickly'] = 'Kérem várjon még $sec másodpercet az üzenet elküldése előtt';
-$messages['errorsavingsent'] = 'Hiba történt az elküldött üzenet mentése közben';
-$messages['errorsaving'] = 'A mentés során hiba lépett fel';
 $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';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP hiba ($code): $msg';
 $messages['emailformaterror'] = 'Helytelen formátumú e-mail cím: $email';
 $messages['toomanyrecipients'] = 'Túl sok a címzett. Csökkentse a címzettek számát maximum $max címre!';
 $messages['maxgroupmembersreached'] = 'A csoport létszáma meghaladja a maximum $max főt';
-$messages['internalerror'] = 'Belső hiba történt, kérjük próbálja újra!';
 $messages['contactdelerror'] = 'Hiba a kapcsolat(ok) törlésekor';
 $messages['contactdeleted'] = 'Kapcsolat(ok) sikeresen törölve';
 $messages['contactrestoreerror'] = 'Nem sikerült a törölt kapcsolat(ok) helyreállítása';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Nem sikerült a mappa létrehozása/mozgatása
 $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 8ee9316c4..fec95f3cd 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Բարի գալուստ $product';
 $labels['username']  = 'Օգտվող';
 $labels['password']  = 'Գաղտնաբառ';
 $labels['server']    = 'Սերվեր';
 $labels['login']     = 'Մուտք';
-
-// taskbar
 $labels['logout']   = 'Ելք';
 $labels['mail']     = 'Էլ–փոստ';
 $labels['settings'] = 'Նախասիրություններ';
 $labels['addressbook'] = 'Հասցեներ';
-
-// mailbox names
 $labels['inbox']  = 'Փոստարկղ';
 $labels['drafts'] = 'Սևագրեր';
 $labels['sent']   = 'Ուղարկված';
 $labels['trash']  = 'Աղբարկղ';
 $labels['junk']   = 'Թափոն';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Վերնագիր';
 $labels['from']    = 'Ուղարկող';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Ստացող';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -54,27 +42,18 @@ $labels['priority'] = 'Առավելություն';
 $labels['organization'] = 'Կազմակերպություն';
 $labels['readstatus'] = 'Ընթերցման կարգավիճակ';
 $labels['listoptions'] = 'Ցուցակի ընտրանքներ…';
-
 $labels['mailboxlist'] = 'Դարակներ';
 $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['download'] = 'Քաշել';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'Ֆայլի անուն';
 $labels['filesize'] = 'Ֆայլի չափ';
-
 $labels['addtoaddressbook'] = 'Հիշել հասցեն';
-
-// weekdays short
 $labels['sun'] = 'Կիր';
 $labels['mon'] = 'Երկ';
 $labels['tue'] = 'Երք';
@@ -82,8 +61,6 @@ $labels['wed'] = 'Չրք';
 $labels['thu'] = 'Հնգ';
 $labels['fri'] = 'Ուրբ';
 $labels['sat'] = 'Շբթ';
-
-// weekdays long
 $labels['sunday']    = 'Կիրակի';
 $labels['monday']    = 'Երկուշաբթի';
 $labels['tuesday']   = 'Երեքշաբթի';
@@ -91,8 +68,6 @@ $labels['wednesday'] = 'Չորեքշաբթի';
 $labels['thursday']  = 'Հինգշաբթի';
 $labels['friday']    = 'Ուրբաթ';
 $labels['saturday']  = 'Շաբաթ';
-
-// months short
 $labels['jan']	= 'Հնվ';
 $labels['feb']	= 'Փետ';
 $labels['mar']	= 'Մար';
@@ -105,8 +80,6 @@ $labels['sep']	= 'Սեպ';
 $labels['oct']	= 'Հոկ';
 $labels['nov']	= 'Նոյ';
 $labels['dec']	= 'Դեկ';
-
-// months long
 $labels['longjan']	= 'Հունվար';
 $labels['longfeb']	= 'Փետրվար';
 $labels['longmar']	= 'Մարտ';
@@ -119,10 +92,7 @@ $labels['longsep']	= 'Սեպտեմբեր';
 $labels['longoct']	= 'Հոկտեմբեր';
 $labels['longnov']	= 'Նոյեմբեր';
 $labels['longdec']	= 'Դեկտեմբեր';
-
 $labels['today'] = 'Այսօր';
-
-// toolbar buttons
 $labels['refresh']          = 'Թարմացնել';
 $labels['checkmail']        = 'Ստուգել նոր նամակները';
 $labels['compose']          = 'Գրել նամակ';
@@ -155,7 +125,6 @@ $labels['moreactions']      = 'Հավելյալ գործողություններ
 $labels['more']             = 'Ավելին';
 $labels['back']             = 'Ետ';
 $labels['options']          = 'Ընտրանքներ';
-
 $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
@@ -163,9 +132,7 @@ $labels['currpage'] = 'Առկա էջ';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ջնջված';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
 $labels['filter'] = 'Զտիչ';
 $labels['list'] = 'Ցուցակ';
@@ -174,7 +141,6 @@ $labels['expand-all'] = 'Ընդլայնել բոլորը';
 $labels['expand-unread'] = 'Ընդլայնել չկարդացվածը';
 $labels['collapse-all'] = 'Փլչել բոլորը';
 $labels['threaded'] = 'Թեմավորված';
-
 $labels['autoexpand_threads'] = 'Բաց անել թեմաները';
 $labels['do_expand'] = 'բոլոր թեմաները';
 $labels['expand_only_unread'] = 'միայն չկարդացված հաղորդագրություններով';
@@ -190,31 +156,19 @@ $labels['listcolumns'] = 'Ցուցակի սյունյակներ';
 $labels['listsorting'] = 'Տեսակավորման սյունյակ';
 $labels['listorder'] = 'Տեսակավորման կարգը';
 $labels['listmode'] = 'Ցուցակով տեսքի տարբերակը';
-
 $labels['folderactions'] = 'Պանակի գործողություններ…';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Դիսկային տարածք';
 $labels['unknown']  = 'անհայտ';
 $labels['unlimited']  = 'անսահմանափակ';
-
 $labels['quicksearch']  = 'Արագ որոնում';
 $labels['resetsearch']  = 'Վերսկսել որոնումը';
 $labels['searchmod']  = 'Որոնման փոփոխիչներ';
 $labels['msgtext']  = 'Ողջ հաղորդագրությունը';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Խմբագրել որպես նոր';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Ուղարկել';
 $labels['savemessage']    = 'Հիշել որպես սևագիր';
 $labels['addattachment']  = 'Կցել ֆայլ';
@@ -224,52 +178,39 @@ $labels['returnreceipt']  = 'Ստացման հավաստագիր';
 $labels['dsn']            = 'Առաքման կարգավիճակի ծանուցում';
 $labels['mailreplyintro'] = '$date-ին, $sender-ը գրեց.';
 $labels['originalmessage'] = 'Առաջին հաղորդագրությունը';
-
 $labels['editidents']    = 'Խմբագրել ինքնությունները';
 $labels['spellcheck']    = 'Տառասխալներ';
 $labels['checkspelling'] = 'Ստուգել ուղագրությունը';
 $labels['resumeediting'] = 'Շարունակել խմբագրումը';
 $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['highest'] = 'Կարևորագույն';
-
 $labels['nosubject']  = '(առանց վերնագրի)';
 $labels['showimages'] = 'Ցուցադրել նկարները';
 $labels['alwaysshow'] = 'Միշտ ցուցադրել պատկերները $sender–ից';
 $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'] = 'Նշում՝ Այս ծանուցագիրը ընդամենը տեղեկացնում է, որ նամակը ցուցադրվել է հասցեատիրոջ համակարչով։ Չկա որևիցե երաշխիք, որ հասցեատերը իսկապես կարդացել է նամակը։';
-
-// address boook
 $labels['name']         = 'Մականուն';
 $labels['firstname']    = 'Անուն';
 $labels['surname']      = 'Ազգանուն';
@@ -304,7 +245,6 @@ $labels['search'] = 'Որոնում';
 $labels['advsearch'] = 'Խորացված որոնում';
 $labels['advanced'] = 'Խորացված';
 $labels['other'] = 'Այլ';
-
 $labels['typehome']   = 'Տուն';
 $labels['typework']   = 'Աշխատանք';
 $labels['typeother']  = 'Այլ';
@@ -319,14 +259,12 @@ $labels['typeassistant']  = 'Օգնական';
 $labels['typehomepage']  = 'Սկիզբ';
 $labels['typeblog'] = 'Բլոգ';
 $labels['typeprofile'] = 'Պրոֆայլ';
-
 $labels['addfield'] = 'Ավելացնել դաշտ…';
 $labels['addcontact'] = 'Գրանցել նշած հասցեն';
 $labels['editcontact'] = 'Խմբագրել հասցեն';
 $labels['contacts'] = 'Կապորդներ';
 $labels['contactproperties'] = 'Կապորդի հատկանիշներ';
 $labels['personalinfo'] = 'Անձնական տվյալներ';
-
 $labels['edit']   = 'Խմբագրել';
 $labels['cancel'] = 'Չեղարկել';
 $labels['save']   = 'Հիշել';
@@ -335,61 +273,44 @@ $labels['rename'] = 'Վերանվանել';
 $labels['addphoto'] = 'Ավելացնել';
 $labels['replacephoto'] = 'Փոխարինել';
 $labels['uploadphoto'] = 'Վերբեռնել լուսանկար';
-
 $labels['newcontact']     = 'Ստեղծել նոր հասցեքարտ';
 $labels['deletecontact']  = 'Ջնջել նշած նամակները';
 $labels['composeto']      = 'Գրել նամակ';
 $labels['contactsfromto'] = 'Հասցեներ $from–ից $to–ը եղած $count–ից';
 $labels['print']          = 'Տպել';
 $labels['export']         = 'Արտահանել';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Արտահանել հասցեները vCard չափաձևով';
 $labels['newcontactgroup'] = 'Ստեղծել կապորդների նոր խումբ';
 $labels['grouprename']    = 'Վերանվանել խումբը';
 $labels['groupdelete']    = 'Ջնջել խումբը';
 $labels['groupremoveselected'] = 'Հեռացնել նշված անձանց խմբից';
-
 $labels['previouspage']   = 'Ցուցադրել նախորդ էջը';
 $labels['firstpage']      = 'Ցուցադրել առաջին էջը';
 $labels['nextpage']       = 'Ցուցադրել հաջորդ էջը';
 $labels['lastpage']       = 'Ցուցադրել վերջին էջը';
-
 $labels['group'] = 'Խումբ';
 $labels['groups'] = 'Խմբեր';
-$labels['listgroup'] = 'List group members';
 $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'] = 'Պարզ ամսաթվեր';
@@ -400,13 +321,9 @@ $labels['timezone']  = 'Ժամային գոտի';
 $labels['pagesize']  = 'Տողեր առ էջ';
 $labels['signature'] = 'Ստորագրություն';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
 $labels['skin'] = 'Տեսքի տարբերակ';
 $labels['logoutclear'] = 'Դուրս գալուց դատարկել աղբարկղը';
@@ -431,7 +348,6 @@ $labels['always'] = 'միշտ';
 $labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
 $labels['autosavedraft']  = 'Սևագրի ավտոմատ գրանցում';
 $labels['everynminutes']  = 'ամեն $n րոպեն';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'երբեք';
 $labels['immediately']  = 'անմիջապես';
 $labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
@@ -453,7 +369,6 @@ $labels['maintenance'] = 'Սպասարկում';
 $labels['newmessage'] = 'Նոր հաղորդագրություն';
 $labels['signatureoptions'] = 'Ստորագրության ընտրանքներ';
 $labels['whenreplying'] = 'Պատասխանելիս';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'սկսել նոր հաղորդագրությունը վերևից';
 $labels['replybottomposting'] = 'սկսել նոր հաղորդագրությունը ներքևից';
 $labels['replyremovesignature'] = 'Պատասխանելիս հեռացնել հաղորդագրությունից նախորդ ստորագրությունը';
@@ -466,7 +381,6 @@ $labels['afternseconds']  = '$n վարկյան հետո';
 $labels['reqmdn'] = 'Միշտ պատվիրել ստացական';
 $labels['reqdsn'] = 'Միշտ պատվիրել առաքման կարգավիճակի ծանուցում';
 $labels['replysamefolder'] = 'Հաղորդագրության պատասխանները պահել նույն պանակում';
-$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ավտոլրացման ժամանակ բացառել այլընտրանքային էլփոստի հասցեները';
 $labels['listnamedisplay'] = 'Ցուցադրել կապորդները որպես';
 $labels['spellcheckbeforesend'] = 'Ստուգել տառասխալները հաղորդագրությունը ուղարկելուց առաջ';
@@ -476,11 +390,6 @@ $labels['spellcheckignorenums'] = 'Անտեսել թվերով բառերը';
 $labels['spellcheckignorecaps'] = 'Անտեսել լրիվ մեծատառ բառերը';
 $labels['addtodict'] = 'Ավելացնել բառարանում';
 $labels['mailtoprotohandler'] = 'mailto: հղումների սպասարկող';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Դարակ';
 $labels['folders']  = 'Դարակներ';
 $labels['foldername']  = 'Դարակի անուն';
@@ -501,26 +410,19 @@ $labels['foldertype'] = 'Պանակի տեսակ';
 $labels['personalfolder']  = 'Անձնական պանակ';
 $labels['otherfolder']  = 'Այլ օգտվողի պանակ';
 $labels['sharedfolder']  = 'Հանրային պանակ';
-
 $labels['sortby'] = 'Դասավորել';
 $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'] = 'Արևմտա-Եվրոպական';
@@ -539,5 +441,4 @@ $labels['vietnamese'] = 'Վիետնամական';
 $labels['japanese'] = 'Ճապոնական';
 $labels['korean'] = 'Կորեական';
 $labels['chinese'] = 'Չինական';
-
 ?>
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 2128a188c..c5d167acf 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Սխա՛լ';
 $messages['loginfailed']  = 'Մուտքը ձախողվեց';
 $messages['cookiesdisabled'] = 'Сookies–ների ապահովվումը բացակայում է';
@@ -28,14 +26,10 @@ $messages['dberror'] = 'Տվյալների շտեմարանի սխա՛լ';
 $messages['requesttimedout'] = 'Հարցման թույլատրելի ժամանակը սպառվեց';
 $messages['errorreadonly'] = 'Գործողությունը անհնար է։ Պանակը միայն ընթերցման համար է։';
 $messages['errornoperm'] = 'Գործողության կատարման իրավունքը մերժված է։';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Սխալ հարցում, ապարդյուն։';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
 $messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Բեռնում...';
 $messages['uploading'] = 'Ֆայլի վերբեռնում…';
 $messages['uploadingmany'] = 'Վերբեռնվում են ֆայլերը…';
@@ -56,8 +50,6 @@ $messages['contactnotfound'] = 'Որոնվող հասցեն չգտնվեց';
 $messages['contactsearchonly'] = 'Ներմուծեք տվյալներ անձանց որոնման համար';
 $messages['sendingfailed'] = 'Նամակի ուղարկումը ձախողվեց';
 $messages['senttooquickly'] = 'Խնդրում ենք սպասել $sec վարկյան մինչ այս նամակն ուղարկելը';
-$messages['errorsavingsent'] = 'Ուղարկված նամակի արխիվացումը խափանվեց';
-$messages['errorsaving'] = 'Գրանցման սխալ';
 $messages['errormoving'] = 'Նամակի տեղափոխման ձախողում';
 $messages['errorcopying'] = 'Հաղորդագրության պատճենումը ձախողվեց։';
 $messages['errordeleting'] = 'Նամակի ջնջման ձախողում';
@@ -101,16 +93,11 @@ $messages['converting'] = 'Նամակի ձևավորման հեռացում…';
 $messages['messageopenerror'] = 'Նամակի բեռնվումը սերվերից ձախողվեց';
 $messages['fileuploaderror'] = 'Ֆայլի կցումն ձախողվեց';
 $messages['filesizeerror'] = 'Ֆայլի չափը գերազանցում է մաքսիմալը՝ $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Այս հասցեն պաշտպանված է';
 $messages['errorsavingcontact'] = 'Հասցեի գրանցումն ձախողվեց';
 $messages['movingmessage'] = 'Նամակը տեղափոխվում է…';
 $messages['copyingmessage'] = 'Հաղորդագրությունների պատճենում…';
 $messages['copyingcontact'] = 'Անձանց պատճենում…';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Հաղորդագրությունների ջնջում…';
 $messages['markingmessage'] = 'Հաղորդագրությունների նշում…';
 $messages['addingmember'] = 'Անձանց ավելացում խմբին…';
@@ -124,13 +111,9 @@ $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'] = '$inserted նոր ներկրված հասցեներ, $skipped արդեն առկա հասցեներ՝ <p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Բաց թողնվեց $skipped առկա գրառում</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
 $messages['nofromaddress'] = 'Նշված անձը հասցե չունի։';
 $messages['editorwarning'] = 'Դեպի պարզ տեքստի խմբագրիչ անցման դեպքում կկորի տեքստի ձևավորումը։ Շարունակե՞լ։';
@@ -144,7 +127,6 @@ $messages['smtperror'] = 'SMTP սխալ` $msg';
 $messages['emailformaterror'] = 'Սխալ էլփոստի հասցե` $email';
 $messages['toomanyrecipients'] = 'Ստացողների քանակը չափազանց մեծ է։ Նվազեցրեք մինչև $max-ը։';
 $messages['maxgroupmembersreached'] = 'Խմբի անդամների քանաքը գերազանցում է թույլատրելի $max-ը։';
-$messages['internalerror'] = 'Ներքին սխալ, կրկին փորձեք։';
 $messages['contactdelerror'] = 'Անձանց ջնջումը ձախողվեց։';
 $messages['contactdeleted'] = 'Անձանց ջնջումը հաջողվեց։';
 $messages['contactrestoreerror'] = 'Ջնջված անձանց վերականգնումը ձախողվեց։';
@@ -170,7 +152,4 @@ $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 1cd614d35..0ff1e939e 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -15,31 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Cassa de entrata';
-$labels['drafts'] = 'Drafts';
 $labels['sent']   = 'Inviate';
-$labels['trash']  = 'Trash';
-$labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Subjecto';
 $labels['from']    = 'Ex';
 $labels['sender']  = 'Expeditor';
@@ -47,34 +33,21 @@ $labels['to']      = 'A';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder a';
-$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['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['open']     = 'Open';
 $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';
@@ -82,8 +55,6 @@ $labels['wed'] = 'mer';
 $labels['thu'] = 'jov';
 $labels['fri'] = 'ven';
 $labels['sat'] = 'sab';
-
-// weekdays long
 $labels['sunday']    = 'Dominica';
 $labels['monday']    = 'Lunedi';
 $labels['tuesday']   = 'Martedi';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'Mercuridi';
 $labels['thursday']  = 'Jovedi';
 $labels['friday']    = 'Venerdi';
 $labels['saturday']  = 'Sabbato';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +74,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'januario';
 $labels['longfeb']	= 'Februario';
 $labels['longmar']	= 'Martio';
@@ -119,168 +86,78 @@ $labels['longsep']	= 'Septembre';
 $labels['longoct']	= 'Octobre';
 $labels['longnov']	= 'Novembre';
 $labels['longdec']	= 'Decembre';
-
 $labels['today'] = 'Hodie';
-
-// 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['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
-$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['type'] = 'Type';
-
 $labels['openinextwin'] = 'Aperir in nove fenestra';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['checkspelling'] = 'Verificar orthographia';
-$labels['resumeediting'] = 'Resume editing';
-$labels['revertto']      = 'Revert to';
-
 $labels['attach'] = 'Attachar';
 $labels['attachments'] = 'Attachamentos';
 $labels['upload'] = 'Incargar';
-$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['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['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';
@@ -304,7 +181,6 @@ $labels['search'] = 'Cercar';
 $labels['advsearch'] = 'Cerca avantiate';
 $labels['advanced'] = 'Avantiate';
 $labels['other'] = 'Altere';
-
 $labels['typehome']   = 'Domo';
 $labels['typework']   = 'Labor';
 $labels['typeother']  = 'Altere';
@@ -312,21 +188,18 @@ $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['cancel'] = 'Cancellar';
 $labels['save']   = 'Salveguardar';
@@ -334,153 +207,60 @@ $labels['delete'] = 'Deler';
 $labels['rename'] = 'Renominar';
 $labels['addphoto'] = 'Adder';
 $labels['replacephoto'] = 'Reimplaciar';
-$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['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['listgroup'] = 'List group members';
 $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['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['showemail'] = 'Show email address with display name';
-$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['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['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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossieres';
 $labels['foldername']  = 'Nomine de dossier';
@@ -489,55 +269,20 @@ $labels['messagecount'] = 'Messages';
 $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['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 d6fbba87d..50ef68145 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -15,162 +15,27 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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['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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 a8d5f4c5b..581428aab 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
 $labels['addressbook'] = 'Buku Alamat';
-
-// mailbox names
 $labels['inbox']  = 'Kotak Masuk';
 $labels['drafts'] = 'Konsep';
 $labels['sent']   = 'Terkirim';
 $labels['trash']  = 'Surat Terhapus';
 $labels['junk']   = 'Sampah';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Tampilkan nama asli untuk folder spesial';
 $labels['subject'] = 'Judul';
 $labels['from']    = 'Pengirim';
 $labels['sender']  = 'Pengirim';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritas';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status Terbaca';
 $labels['listoptions'] = 'Daftar Pilihan...';
-
 $labels['mailboxlist'] = 'Semua Folder';
 $labels['messagesfromto'] = 'Pesan dari $from sampai $to dari total $count';
 $labels['threadsfromto'] = 'Untaian dari $from sampai $to dari total $count';
 $labels['messagenrof'] = 'Pesan $nr dari total $count';
 $labels['fromtoshort'] = '$from - $to dari total $count';
-
 $labels['copy']     = 'Salin';
 $labels['move']     = 'Pindahkan';
 $labels['moveto']   = 'Pindahkan ke...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Unduh';
 $labels['open']     = 'Buka';
 $labels['showattachment'] = 'Tampilkan';
 $labels['showanyway'] = 'Tampilkan saja';
-
 $labels['filename'] = 'Nama berkas';
 $labels['filesize'] = 'Ukuran berkas';
-
 $labels['addtoaddressbook'] = 'Tambah ke buku alamat';
-
-// weekdays short
 $labels['sun'] = 'Min';
 $labels['mon'] = 'Sen';
 $labels['tue'] = 'Sel';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kam';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-
-// weekdays long
 $labels['sunday']    = 'Minggu';
 $labels['monday']    = 'Senin';
 $labels['tuesday']   = 'Selasa';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Rabu';
 $labels['thursday']  = 'Kamis';
 $labels['friday']    = 'Jumat';
 $labels['saturday']  = 'Sabtu';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Des';
-
-// months long
 $labels['longjan']	= 'Januari';
 $labels['longfeb']	= 'Februari';
 $labels['longmar']	= 'Maret';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Spetember';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Desember';
-
 $labels['today'] = 'Hari ini';
-
-// toolbar buttons
 $labels['refresh']          = 'Segarkan';
 $labels['checkmail']        = 'Periksa pesan baru';
 $labels['compose']          = 'Tulis sebuah pesan';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Tindakan lain..';
 $labels['more']             = 'Berikutnya';
 $labels['back']             = 'Kembali';
 $labels['options']          = 'Pilihan';
-
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tidak ada';
@@ -174,7 +148,6 @@ $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';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Perlihatkan kolom';
 $labels['listsorting'] = 'Mengurutkan kolom';
 $labels['listorder'] = 'Mengurutkan susunan';
 $labels['listmode'] = 'Perlihatkan mode tinjauan';
-
 $labels['folderactions'] = 'Tindakan pada folder...';
 $labels['compact'] = 'Rampingkan';
 $labels['empty'] = 'Kosong';
-$labels['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Impor pesan';
 $labels['quota'] = 'Penggunaan ruang';
 $labels['unknown']  = 'Tidak dikenal';
 $labels['unlimited']  = 'Tidak terbatas';
-
 $labels['quicksearch']  = 'Pencarian cepat';
 $labels['resetsearch']  = 'Atur ulang pencarian';
 $labels['searchmod']  = 'Peubah pencarian';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Seluruh pesan';
 $labels['body']  = 'Badan';
 $labels['type'] = 'Tipe';
 $labels['namex'] = 'Nama';
-
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
 $labels['changeformattext'] = 'Tampilkan dalam format text biasa';
 $labels['changeformathtml'] = 'Tampilkan dalam format HTML';
-
-// message compose
 $labels['editasnew']      = 'Sunting sebagai pesan baru';
 $labels['send']           = 'Kirim';
 $labels['sendmessage']    = 'Kirim pesan';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Tanda terima kembali';
 $labels['dsn']            = 'Pemberitahuan status terkirim';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis:';
 $labels['originalmessage'] = 'Pesan Asli';
-
 $labels['editidents']    = 'Ubah identitas';
 $labels['spellcheck']    = 'Ejaan';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
 $labels['revertto']      = 'Kembalikan 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['highest'] = 'Paling tinggi';
-
 $labels['nosubject']  = '(tanpa judul)';
 $labels['showimages'] = 'Tampilkan gambar';
 $labels['alwaysshow'] = 'Selalu tampilkan gambar dari $sender';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Ini adalah konsep surat.';
 $labels['andnmore']   = '$nr lagi...';
 $labels['togglemoreheaders'] = 'Tampilkan kepala pesan lebih lanjut';
 $labels['togglefullheaders'] = 'Beralih kepala pesan penuh';
-
 $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.';
-
-// address boook
 $labels['name']         = 'Nama yang ditampilkan';
 $labels['firstname']    = 'Nama depan';
 $labels['surname']      = 'Nama belakang';
@@ -305,7 +262,6 @@ $labels['search'] = 'Cari';
 $labels['advsearch'] = 'Pencarian Lebih Lanjut';
 $labels['advanced'] = 'Tingkat lanjut';
 $labels['other'] = 'Lainnya';
-
 $labels['typehome']   = 'Rumah';
 $labels['typework']   = 'Kantor';
 $labels['typeother']  = 'Lainnya';
@@ -320,14 +276,12 @@ $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['cancel'] = 'Batal';
 $labels['save']   = 'Simpan';
@@ -336,7 +290,6 @@ $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';
@@ -350,42 +303,32 @@ $labels['newcontactgroup'] = 'Buat Grup baru';
 $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['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Daftar anggota grup';
 $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'] = 'Anda dapat mengunggah kontak dari buku alamat yang telah ada.<br/>Saat ini kami mendukung import alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> atau CSV (comma-separated).';
 $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';
@@ -407,7 +350,7 @@ $labels['htmleditor'] = 'Tulis pesan HTML';
 $labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
 $labels['htmlonreplyandforward'] = 'ketika meneruskan atau membalas pesan HTML';
 $labels['htmlsignature'] = 'Tandatangan HTML';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Tampilkan alamat email dengan nama';
 $labels['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
 $labels['logoutclear'] = 'Bersihkan Tong Sampah saat keluar';
@@ -477,11 +420,10 @@ $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['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Kelola popup sebagai standar window';
 $labels['forwardmode'] = 'Meneruskan pesan';
 $labels['inline'] = 'dalam surat';
 $labels['asattachment'] = 'sebagai sisipan';
-
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Semua Folder';
 $labels['foldername']  = 'Nama folder';
@@ -502,26 +444,20 @@ $labels['foldertype'] = 'Jenis folder';
 $labels['personalfolder']  = 'Folder pribadi';
 $labels['otherfolder']  = 'Folder pengguna lain';
 $labels['sharedfolder']  = 'Folder publik';
-
 $labels['sortby'] = 'Urut berdasarkan';
 $labels['sortasc']  = 'Urut menaik';
 $labels['sortdesc'] = 'Urut menurun';
 $labels['undo'] = 'Batalkan';
-
 $labels['installedplugins'] = 'Plugin terpasang';
 $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';
@@ -540,5 +476,4 @@ $labels['vietnamese'] = 'Vietnam';
 $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 a81b2ab01..020b03f8a 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Terjadi error!';
 $messages['loginfailed']  = 'Login gagal.';
 $messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Kontak yang diminta tidak ditemukan';
 $messages['contactsearchonly'] = 'Masukkan jenis pencarian untuk mencari kontak';
 $messages['sendingfailed'] = 'Gagal mengirim pesan.';
 $messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini.';
-$messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim.';
-$messages['errorsaving'] = 'Error ketika menyimpan.';
 $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
 $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
@@ -101,16 +97,16 @@ $messages['converting'] = 'Mengembalikan pesan ke format awal...';
 $messages['messageopenerror'] = 'Tidak dapat mengambil pesan dari server';
 $messages['fileuploaderror'] = 'Gagal mengunggah berkas';
 $messages['filesizeerror'] = 'Berkas terunggah mencapai ukuran maksimal dari $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = 'Berhasil menyalin kontak $nr';
+$messages['movesuccess'] = 'Berhasil memindahkan kontak $nr';
+$messages['copyerror'] = 'Tidak dapat menyalin kontak';
+$messages['moveerror'] = 'Tidak dapat memindahkan kontak';
 $messages['sourceisreadonly'] = 'Sumber dari alamat ini hanya dapat dibaca';
 $messages['errorsavingcontact'] = 'Tidak bisa menyimpan alamat kontak';
 $messages['movingmessage'] = 'Memindahkan pesan...';
 $messages['copyingmessage'] = 'Menyalin pesan...';
 $messages['copyingcontact'] = 'Menyalin kontak...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = 'Memindahkan kontak(s)...';
 $messages['deletingmessage'] = 'Menghapus pesan...';
 $messages['markingmessage'] = 'Menandai Pesan...';
 $messages['addingmember'] = 'Menambahkan kontak ke grup...';
@@ -129,8 +125,8 @@ $messages['importwait'] = 'Sedang mengimpor, harap menunggu...';
 $messages['importformaterror'] = 'Proses import gagal. File yang di upload bukan file import yang valid.';
 $messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak</b>';
 $messages['importconfirmskipped'] = '<b>$skipped entri yang sudah ada dilewatkan</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = 'Berhasil mengimport $nr pesan';
+$messages['importmessageerror'] = 'Gagal mengimport! File yang di upload buka pesan yang valid atau file mailbox';
 $messages['opnotpermitted'] = 'Operasi tidak diperbolehkan!';
 $messages['nofromaddress'] = 'kekurangan alamat e-mail pada identitas terpilih';
 $messages['editorwarning'] = 'Beralih pada editor teks murni akan mengakibatkan semua pemformatan teks hilang. Lanjutkan?';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP Error : $msg';
 $messages['emailformaterror'] = 'Alamat e-mail salah: $email';
 $messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
 $messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max';
-$messages['internalerror'] = 'Terjadi kesalahan internal. Silahkan diulang kembali';
 $messages['contactdelerror'] = 'Kontak tidak bisa dihapus';
 $messages['contactdeleted'] = 'Kontak berhasil dihapus';
 $messages['contactrestoreerror'] = 'Tidak bisa mengembalikan kontak yang terhapus.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Tidak bisa membuat/memindahkan map ke map indu
 $messages['messagetoobig'] = 'Pesan terlalu besar untuk diproses.';
 $messages['attachmentvalidationerror'] = 'PERINGATAN! Lampiran ini mencurigakan karena jenisnya tidak cocok dengan jenis yang dinyatakan di dalam pesan. Jika Anda tidak mempercayai pengirim, Anda tidak perlu membukanya di browser karena mungkin berisi konten berbahaya.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Peringatan: Layanan ini membutuhkan Javascript! Untuk menggunakannya silahkan aktifkan Javascript di pengaturan browser Anda.';
-
 ?>
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 4b848dc49..616999514 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -96,6 +96,7 @@ $rcube_languages = array(
   'th_TH' => 'Thai (ไทย)',
   'tr_TR' => 'Turkish (Türkçe)',
   'uk_UA' => 'Ukrainian (Українська)',
+  'ur_PK' => 'Urdu (اُردو)',
   'vi_VN' => 'Vietnamese (Tiếng Việt)',
   'cy_GB' => 'Welsh (Cymraeg)',
   'fy_NL' => 'West Frisian (Frysk)',
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index c2859ce75..8b90730f7 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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á';
-
-// mailbox names
 $labels['inbox']  = 'Innhólf';
 $labels['drafts'] = 'Drög';
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Rusl';
 $labels['junk']   = 'Ruslpóstur';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Titill';
 $labels['from']    = 'Frá';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Til';
 $labels['cc']      = 'Afrit';
 $labels['bcc']     = 'Blint afrit';
@@ -53,28 +41,18 @@ $labels['size']    = 'Stærð';
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
 $labels['readstatus'] = 'Lesmerking';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = '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['download'] = 'Hlaða niður';
-$labels['open']     = 'Open';
-$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ð.';
@@ -82,8 +60,6 @@ $labels['wed'] = 'miðv.';
 $labels['thu'] = 'fimm.';
 $labels['fri'] = 'föst.';
 $labels['sat'] = 'laug.';
-
-// weekdays long
 $labels['sunday']    = 'sunnudagur';
 $labels['monday']    = 'mánudagur';
 $labels['tuesday']   = 'þriðjudagur';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'miðvikudagur';
 $labels['thursday']  = 'fimmtudagur';
 $labels['friday']    = 'föstudagur';
 $labels['saturday']  = 'laugardagur';
-
-// months short
 $labels['jan']	= 'jan';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mar';
@@ -105,8 +79,6 @@ $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';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'september';
 $labels['longoct']	= 'október';
 $labels['longnov']	= 'nóvember';
 $labels['longdec']	= 'desember';
-
 $labels['today'] = 'Í dag';
-
-// toolbar buttons
 $labels['refresh']          = 'Endurhlaða';
 $labels['checkmail']        = 'Gá að nýjum skeytum';
 $labels['compose']          = 'Semja skeyti';
@@ -155,7 +124,6 @@ $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';
@@ -163,9 +131,7 @@ $labels['currpage'] = 'Núverandi síða';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eytt';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
 $labels['filter'] = 'Sía';
 $labels['list'] = 'Listi';
@@ -174,7 +140,6 @@ $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';
@@ -190,31 +155,19 @@ $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['importmessages'] = 'Import messages';
-
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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ð';
@@ -224,52 +177,39 @@ $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['checkspelling'] = 'Athuga stafsetningu';
 $labels['resumeediting'] = 'Aftur í ritham';
 $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['highest'] = 'Hæst';
-
 $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['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ð.';
-
-// address boook
 $labels['name']         = 'Skjánafn';
 $labels['firstname']    = 'Eiginnafn';
 $labels['surname']      = 'Eftirnafn';
@@ -304,7 +244,6 @@ $labels['search'] = 'Leit';
 $labels['advsearch'] = 'Ítarleg leit';
 $labels['advanced'] = 'Flóknari stillingar';
 $labels['other'] = 'Annað';
-
 $labels['typehome']   = 'Heimamappa';
 $labels['typework']   = 'Vinnusími';
 $labels['typeother']  = 'Annað';
@@ -319,14 +258,12 @@ $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['cancel'] = 'Hætta við';
 $labels['save']   = 'Vista';
@@ -334,62 +271,43 @@ $labels['delete'] = 'Eyða';
 $labels['rename'] = 'Endurnefna';
 $labels['addphoto'] = 'Bæta við';
 $labels['replacephoto'] = 'Skipta út';
-$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['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['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['listgroup'] = 'List group members';
 $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';
@@ -400,13 +318,9 @@ $labels['timezone']  = 'Tímabelti';
 $labels['pagesize']  = 'Línur á síðu';
 $labels['signature'] = 'Undirskrift';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
 $labels['logoutclear'] = 'Tæma rusl við útskráningu';
@@ -424,14 +338,12 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'aldrei';
 $labels['immediately']  = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
@@ -447,13 +359,11 @@ $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';
@@ -466,7 +376,6 @@ $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['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';
@@ -475,12 +384,6 @@ $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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Mappa';
 $labels['folders']  = 'Möppur';
 $labels['foldername']  = 'Nafn möppu';
@@ -501,26 +404,19 @@ $labels['foldertype'] = 'Möpputegund';
 $labels['personalfolder']  = 'Einkamappa';
 $labels['otherfolder']  = 'Möppur annara notenda';
 $labels['sharedfolder']  = 'Opin mappa';
-
 $labels['sortby'] = 'Raða eftir';
 $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';
@@ -539,5 +435,4 @@ $labels['vietnamese'] = 'Víetnamskt';
 $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 731a19791..06b707389 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -15,162 +15,44 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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['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['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['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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 55cd432f7..ac8e2a6d4 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Posta in arrivo';
 $labels['drafts'] = 'Bozze';
 $labels['sent']   = 'Inviata';
 $labels['trash']  = 'Cestino';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Mostra nomi reali per le cartelle speciali';
 $labels['subject'] = 'Oggetto';
 $labels['from']    = 'Mittente';
 $labels['sender']  = 'Mittente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorità';
 $labels['organization'] = 'Società';
 $labels['readstatus'] = 'Visualizza lo stato';
 $labels['listoptions'] = 'Elenco opzioni...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Download';
 $labels['open']     = 'Apri';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Gio';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-
-// weekdays long
 $labels['sunday']    = 'Domenica';
 $labels['monday']    = 'Lunedì';
 $labels['tuesday']   = 'Martedì';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mercoledì';
 $labels['thursday']  = 'Giovedì';
 $labels['friday']    = 'Venerdì';
 $labels['saturday']  = 'Sabato';
-
-// months short
 $labels['jan']	= 'Gen';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Set';
 $labels['oct']	= 'Ott';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dic';
-
-// months long
 $labels['longjan']	= 'Gennaio';
 $labels['longfeb']	= 'Febbraio';
 $labels['longmar']	= 'Marzo';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Settembre';
 $labels['longoct']	= 'Ottobre';
 $labels['longnov']	= 'Novembre';
 $labels['longdec']	= 'Dicembre';
-
 $labels['today'] = 'Oggi';
-
-// toolbar buttons
 $labels['refresh']          = 'Aggiorna';
 $labels['checkmail']        = 'Controlla nuovi messaggi';
 $labels['compose']          = 'Scrivi un messaggio';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Altre operazioni...';
 $labels['more']             = 'Di più';
 $labels['back']             = 'Indietro';
 $labels['options']          = 'Opzioni';
-
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Importa messaggi';
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Tipo';
+$labels['namex'] = 'Nome';
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
 $labels['changeformattext'] = 'Visualizza nel formato testo semplice';
 $labels['changeformathtml'] = 'Visualizza nel formato HTML';
-
-// message compose
 $labels['editasnew']      = 'Modifica come nuovo';
 $labels['send']           = 'Invia';
 $labels['sendmessage']    = 'Invia il messaggio adesso';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Controlla ortografia';
 $labels['resumeediting'] = 'Torna al messaggio';
 $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['highest'] = 'Molto alta';
-
 $labels['nosubject']  = '(nessun oggetto)';
 $labels['showimages'] = 'Visualizza immagini';
 $labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Nome visualizzato';
 $labels['firstname']    = 'Nome';
 $labels['surname']      = 'Cognome';
@@ -304,7 +262,6 @@ $labels['search'] = 'Ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
 $labels['advanced'] = 'Opzioni avanzate';
 $labels['other'] = 'Altro';
-
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Lavoro';
 $labels['typeother']  = 'Altro';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Annulla';
 $labels['save']   = 'Salva';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Crea un nuovo 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['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppi';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Elenca membri dei 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['importtarget'] = 'Aggiungi contatti a';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
+$labels['importgroups'] = 'Importa le assegnazioni di gruppo';
+$labels['importgroupsall'] = 'Tutti (crea i gruppi se necessario)';
+$labels['importgroupsexisting'] = 'Solo per i gruppi esistenti';
 $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';
@@ -423,7 +371,7 @@ $labels['ignore'] = 'ignora';
 $labels['readwhendeleted'] = 'Marca il messaggio come letto prima di eliminarlo';
 $labels['flagfordeletion'] = 'Marca il messaggio come eliminato invece di eliminarlo';
 $labels['skipdeleted'] = 'Non mostrare i messaggi marcati come eliminati';
-$labels['deletealways'] = 'Quando non è possinile spostare i messaggi nel Cestino eliminali';
+$labels['deletealways'] = 'Quando non è possibile spostare i messaggi nel Cestino, eliminali';
 $labels['deletejunk'] = 'Elimina direttamente i messaggi in Spam';
 $labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
 $labels['fromknownsenders'] = 'da mittenti conosciuti';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Gestisci i popup come finestre standard';
 $labels['forwardmode'] = 'Inoltro messaggi';
 $labels['inline'] = 'In linea';
 $labels['asattachment'] = 'come allegato';
-
 $labels['folder']  = 'Cartella';
 $labels['folders']  = 'Cartelle';
 $labels['foldername']  = 'Nome cartella';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Tipo di cartella';
 $labels['personalfolder']  = 'Cartella privata';
 $labels['otherfolder']  = 'Cartella di un altro utente';
 $labels['sharedfolder']  = 'Cartella pubblica';
-
 $labels['sortby'] = 'Ordina per';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 502ecba25..c5a81044e 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Si è verificato un errore!';
 $messages['loginfailed']  = 'Impossibile accedere. Utente o password non corretti';
 $messages['cookiesdisabled'] = 'Il tuo browser non accetta i cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Il contatto richiesto non è stato trovato';
 $messages['contactsearchonly'] = 'Inserisci dei termini per cercare i contatti';
 $messages['sendingfailed'] = 'Impossibile inviare il messaggio';
 $messages['senttooquickly'] = 'Per favore, attendi $sec secondi prima di inviare questo messaggio';
-$messages['errorsavingsent'] = 'C\'è stato un errore nel salvare il messaggio inviato';
-$messages['errorsaving'] = 'Impossibile salvare';
 $messages['errormoving'] = 'Impossibile spostare il messaggio';
 $messages['errorcopying'] = 'Impossibile copiare il messaggio';
 $messages['errordeleting'] = 'Impossibile eliminare il messaggio';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Errore SMTP: $msg';
 $messages['emailformaterror'] = 'Indirizzo e-mail non corretto: $email';
 $messages['toomanyrecipients'] = 'Numero eccessivo di destinatari, ridurlo a $max';
 $messages['maxgroupmembersreached'] = 'Il numero dei membri del gruppo eccede il massimo di $max';
-$messages['internalerror'] = 'Si è verificato un errore interno. Si prega di riprovare di nuovo.';
 $messages['contactdelerror'] = 'Impossibile eliminare il/i contatto/i';
 $messages['contactdeleted'] = 'Contatto/i correttamente eliminato/i';
 $messages['contactrestoreerror'] = 'Impossibile ripristinare il/i contatto/i cancellato/i';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Impossibile creare o muovere la cartella: acce
 $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 767aff23a..aadc8fce0 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$productにようこそ';
 $labels['username']  = 'ユーザー名';
 $labels['password']  = 'パスワード';
 $labels['server']    = 'サーバー';
 $labels['login']     = 'ログイン';
-
-// taskbar
 $labels['logout']   = 'ログアウト';
 $labels['mail']     = '電子メール';
 $labels['settings'] = '設定';
 $labels['addressbook'] = 'アドレス帳';
-
-// mailbox names
 $labels['inbox']  = '受信箱';
 $labels['drafts'] = '下書き';
 $labels['sent']   = '送信済み';
 $labels['trash']  = 'ごみ箱';
 $labels['junk']   = '迷惑メール';
 $labels['show_real_foldernames'] = '特殊フォルダーの実際の名前を表示';
-
-// message listing
 $labels['subject'] = '件名';
 $labels['from']    = '発信者';
 $labels['sender']  = '送信者';
@@ -54,13 +44,11 @@ $labels['priority'] = '優先度';
 $labels['organization'] = '企業名';
 $labels['readstatus'] = '閲覧の状態';
 $labels['listoptions'] = '一覧のオプション...';
-
 $labels['mailboxlist'] = 'フォルダー';
 $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']   = 'フォルダーに移動';
@@ -68,13 +56,9 @@ $labels['download'] = 'ダウンロード';
 $labels['open']     = '開く';
 $labels['showattachment'] = '表示';
 $labels['showanyway'] = 'とにかく表示';
-
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイルの大きさ';
-
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
-
-// weekdays short
 $labels['sun'] = '日';
 $labels['mon'] = '月';
 $labels['tue'] = '火';
@@ -82,8 +66,6 @@ $labels['wed'] = '水';
 $labels['thu'] = '木';
 $labels['fri'] = '金';
 $labels['sat'] = '土';
-
-// weekdays long
 $labels['sunday']    = '日曜日';
 $labels['monday']    = '月曜日';
 $labels['tuesday']   = '火曜日';
@@ -91,8 +73,6 @@ $labels['wednesday'] = '水曜日';
 $labels['thursday']  = '木曜日';
 $labels['friday']    = '金曜日';
 $labels['saturday']  = '土曜日';
-
-// months short
 $labels['jan']	= '1月';
 $labels['feb']	= '2月';
 $labels['mar']	= '3月';
@@ -105,8 +85,6 @@ $labels['sep']	= '9月';
 $labels['oct']	= '10月';
 $labels['nov']	= '11月';
 $labels['dec']	= '12月';
-
-// months long
 $labels['longjan']	= '1月';
 $labels['longfeb']	= '2月';
 $labels['longmar']	= '3月';
@@ -119,10 +97,7 @@ $labels['longsep']	= '9月';
 $labels['longoct']	= '10月';
 $labels['longnov']	= '11月';
 $labels['longdec']	= '12月';
-
 $labels['today'] = '今日';
-
-// toolbar buttons
 $labels['refresh']          = '再読込み';
 $labels['checkmail']        = '新しく届いたメッセージを確認';
 $labels['compose']          = 'メッセージの作成';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'その他の操作...';
 $labels['more']             = '続く';
 $labels['back']             = '戻る';
 $labels['options']          = 'オプション';
-
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'すべて展開';
 $labels['expand-unread'] = '未開封のメッセージを展開';
 $labels['collapse-all'] = 'すべて折りたたむ';
 $labels['threaded'] = 'スレッド化';
-
 $labels['autoexpand_threads'] = 'メッセージのスレッドを展開';
 $labels['do_expand'] = 'すべてのスレッド';
 $labels['expand_only_unread'] = '未読のメッセージだけ';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = '列を一覧';
 $labels['listsorting'] = '並べ替える列';
 $labels['listorder'] = '並べ替える順序';
 $labels['listmode'] = '一覧表示モード';
-
 $labels['folderactions'] = 'フォルダーの操作...';
 $labels['compact'] = '圧縮';
 $labels['empty'] = '空';
 $labels['importmessages'] = 'メッセージをインポート';
-
 $labels['quota'] = 'ディスクの使用状況';
 $labels['unknown']  = '不明';
 $labels['unlimited']  = '無制限';
-
 $labels['quicksearch']  = '高速検索';
 $labels['resetsearch']  = '検索を解除';
 $labels['searchmod']  = '検索の条件';
 $labels['msgtext']  = 'メッセージ全体';
 $labels['body']  = '本文';
-$labels['type'] = 'Type';
-
+$labels['type'] = '種類';
+$labels['namex'] = '名前';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
 $labels['changeformattext'] = 'テキスト形式で表示';
 $labels['changeformathtml'] = 'HTML形式で表示';
-
-// message compose
 $labels['editasnew']      = '新しいメッセージとして編集';
 $labels['send']           = '送信';
 $labels['sendmessage']    = 'メッセージを送信';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = '開封確認';
 $labels['dsn']            = '配送状態通知';
 $labels['mailreplyintro'] = '$date に $sender さんは書きました:';
 $labels['originalmessage'] = '元のメッセージ';
-
 $labels['editidents']    = '識別情報を編集';
 $labels['spellcheck']    = 'スペル';
 $labels['checkspelling'] = 'スペルチェック';
 $labels['resumeediting'] = '編集を再開';
 $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['highest'] = '最高';
-
 $labels['nosubject']  = '(件名なし)';
 $labels['showimages'] = '画像を表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
@@ -251,25 +215,19 @@ $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'] = '注意: この開封確認は、メッセージが宛先のコンピューターで表示されたことだけを知らせるものです。受信者がメッセージを読んだり、内容を理解したと保証するものではありません。';
-
-// address boook
 $labels['name']         = '表示名';
 $labels['firstname']    = '名';
 $labels['surname']      = '姓';
@@ -304,7 +262,6 @@ $labels['search'] = '検索';
 $labels['advsearch'] = '高度な検索';
 $labels['advanced'] = '高度';
 $labels['other'] = 'その他';
-
 $labels['typehome']   = '自宅';
 $labels['typework']   = '職場';
 $labels['typeother']  = 'その他';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = 'アシスタント';
 $labels['typehomepage']  = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
-
 $labels['addfield'] = '項目を追加...';
 $labels['addcontact'] = '新しい連絡先を追加';
 $labels['editcontact'] = '連絡先を編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先の属性';
 $labels['personalinfo'] = '個人情報';
-
 $labels['edit']   = '編集';
 $labels['cancel'] = '取り消し';
 $labels['save']   = '保存';
@@ -335,7 +290,6 @@ $labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置き換え';
 $labels['uploadphoto'] = '写真をアップロード';
-
 $labels['newcontact']     = '新しい連絡先カードを作成';
 $labels['deletecontact']  = '選択した連絡先を削除';
 $labels['composeto']      = 'この連絡先宛にメッセージを作成';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = '連絡先グループを新しく作成';
 $labels['grouprename']    = 'グループ名を変更';
 $labels['groupdelete']    = 'グループを削除';
 $labels['groupremoveselected'] = '選択した連絡先をグループから削除';
-
 $labels['previouspage']   = '前のページを表示';
 $labels['firstpage']      = '最初のページを表示';
 $labels['nextpage']       = '次のページを表示';
 $labels['lastpage']       = '最後のページを表示';
-
 $labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
 $labels['listgroup'] = 'グループのメンバーを一覧';
 $labels['personaladrbook'] = '個人の住所';
-
 $labels['searchsave'] = '検索情報を保存';
 $labels['searchdelete'] = '検索情報を削除';
-
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先をインポート';
 $labels['importfromfile'] = 'ファイルからインポート';
-$labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
+$labels['importtarget'] = '次に連絡先を追加';
 $labels['importreplace'] = 'アドレス帳全体と置き換え';
+$labels['importgroups'] = 'グループの割り当てをインポート';
+$labels['importgroupsall'] = 'すべて (必要ならグループを作成)';
+$labels['importgroupsexisting'] = '存在するグループだけ';
 $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メッセージ';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'ポップアップを通常のウィンドウと�
 $labels['forwardmode'] = 'メッセージの転送形式';
 $labels['inline'] = 'インライン';
 $labels['asattachment'] = '添付ファイル';
-
 $labels['folder']  = 'フォルダー';
 $labels['folders']  = 'フォルダー';
 $labels['foldername']  = 'フォルダー名';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'フォルダーの種類';
 $labels['personalfolder']  = '個人フォルダー';
 $labels['otherfolder']  = '他のユーザーのフォルダー';
 $labels['sharedfolder']  = '公開フォルダー';
-
 $labels['sortby'] = '並べ替え';
 $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'] = '西ヨーロッパ言語';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'ベトナム語';
 $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
-
 ?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 820b52d96..fb03bc0f8 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'エラーが発生しました!';
 $messages['loginfailed']  = 'ログインできませんでした。';
 $messages['cookiesdisabled'] = 'ブラウザーがCookieを受け付けません。';
@@ -56,7 +54,7 @@ $messages['contactnotfound'] = '連絡先が見つかりません。';
 $messages['contactsearchonly'] = '連絡先を探すための検索語を入力してください';
 $messages['sendingfailed'] = 'メッセージを送信できませんでした。';
 $messages['senttooquickly'] = 'このメッセージを送信するまで、$sec秒お待ちください。';
-$messages['errorsavingsent'] = '送信メッセージの保存中にエラーが発生しました。';
+$messages['errorsavingsent'] = '送信したメッセージの保存中にエラーが発生しました。';
 $messages['errorsaving'] = '保存中にエラーが発生しました。';
 $messages['errormoving'] = 'メッセージを移動できません。';
 $messages['errorcopying'] = 'メッセージをコピーできません。';
@@ -172,5 +170,4 @@ $messages['parentnotwritable'] = '選択した親フォルダーに作成また�
 $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 b0126c44e..7a14b6216 100755..100644
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'მოგესალმებათ $product';
 $labels['username']  = 'მომხმარებელი';
 $labels['password']  = 'პაროლი';
 $labels['server']    = 'სერვერი';
 $labels['login']     = 'შესვლა';
-
-// taskbar
 $labels['logout']   = 'გამოსვლა';
 $labels['mail']     = 'ელფოსტა';
 $labels['settings'] = 'პარამეტრები';
 $labels['addressbook'] = 'მისამართები';
-
-// mailbox names
 $labels['inbox']  = 'მიღებული';
 $labels['drafts'] = 'დროებითი';
 $labels['sent']   = 'გაგზავნილი';
 $labels['trash']  = 'წაშლილი';
 $labels['junk']   = 'სპამი';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'სათაური';
 $labels['from']    = 'გამგზავნი';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ვის';
 $labels['cc']      = 'ასლი';
 $labels['bcc']     = 'ფარული';
 $labels['replyto'] = 'პასუხი';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'თარიღი';
 $labels['size']    = 'ზომა';
 $labels['priority'] = 'პრიორიტეტი';
 $labels['organization'] = 'ორგანიზაცია';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'საქაღალდეები';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'შეტყობინება $nr დან $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'ასლი';
 $labels['move']     = 'გადატანა';
 $labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ფაილის სახელი';
 $labels['filesize'] = 'ფაილის ზომა';
-
 $labels['addtoaddressbook'] = 'მისამართებში დამატება';
-
-// weekdays short
 $labels['sun'] = 'კვი';
 $labels['mon'] = 'ორშ';
 $labels['tue'] = 'სამ';
@@ -82,8 +55,6 @@ $labels['wed'] = 'ოთხ';
 $labels['thu'] = 'ხუთ';
 $labels['fri'] = 'პარ';
 $labels['sat'] = 'შაბ';
-
-// weekdays long
 $labels['sunday']    = 'კვირა';
 $labels['monday']    = 'ორშაბათი';
 $labels['tuesday']   = 'სამშაბათი';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'ოთხშაბათი';
 $labels['thursday']  = 'ხუთშაბათი';
 $labels['friday']    = 'პარასკევი';
 $labels['saturday']  = 'შაბათი';
-
-// months short
 $labels['jan']	= 'იან';
 $labels['feb']	= 'თებ';
 $labels['mar']	= 'მარ';
@@ -105,8 +74,6 @@ $labels['sep']	= 'სექ';
 $labels['oct']	= 'ოქტ';
 $labels['nov']	= 'ნოე';
 $labels['dec']	= 'დეკ';
-
-// months long
 $labels['longjan']	= 'იანვარი';
 $labels['longfeb']	= 'თებერვალი';
 $labels['longmar']	= 'მარტი';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'სექტემბერი';
 $labels['longoct']	= 'ოქტომბერი';
 $labels['longnov']	= 'ნოემბერი';
 $labels['longdec']	= 'დეკემბერი';
-
 $labels['today'] = 'დღეს';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'შემოწმება ახალ შეტყობინებაზე';
 $labels['compose']          = 'შეტყობინების დაწერა';
 $labels['writenewmessage']  = 'ახალი შეტყობინება';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'პასუხი';
 $labels['replytoallmessage'] = 'პასუხი ყველას';
-$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'] = 'შეტყობინების წაშლილებში გადატანა';
@@ -145,17 +102,12 @@ $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'] = 'არცერთი';
@@ -163,124 +115,70 @@ $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'შეზღუდვა';
 $labels['unknown']  = 'უცნობი';
 $labels['unlimited']  = 'შეუზღუდავი';
-
 $labels['quicksearch']  = 'სწრაფი ძიება';
 $labels['resetsearch']  = 'ძიების გასუფთავება';
 $labels['searchmod']  = 'ძებნის ვარიანტები';
 $labels['msgtext']  = 'ყველა შეტყობინება';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'გზავნილები';
 $labels['upload'] = 'ატვირთვა';
-$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['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'] = 'განმარტება: ეს ნიშნავს რომ ადრესატმა მიიღო შეტყობინება. მაგრამ, არ ნიშნავს რომ წაიკითხა ან გაიგო ტექსტი';
-
-// 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']      = 'მისამართი';
@@ -290,21 +188,14 @@ $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['typehome']   = 'სახლი';
 $labels['typework']   = 'სამსახური';
 $labels['typeother']  = 'სხვა';
@@ -315,18 +206,13 @@ $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['cancel'] = 'გაუქმება';
 $labels['save']   = 'შენახვა';
@@ -334,62 +220,42 @@ $labels['delete'] = 'წაშლა';
 $labels['rename'] = 'გადარქმევა';
 $labels['addphoto'] = 'დამატება';
 $labels['replacephoto'] = 'გამოცვლა';
-$labels['uploadphoto'] = 'Upload photo';
-
 $labels['newcontact']     = 'კონტაქტის შექმნა';
 $labels['deletecontact']  = 'მონიშნელი კონტაქტის წაშლა';
 $labels['composeto']      = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
 $labels['contactsfromto'] = 'კონტაქტები $from დან $to ში $count';
 $labels['print']          = 'დაბეჭვდა';
 $labels['export']         = 'ექსპორტი';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'კონტაქტების ექსპორტი vCard ფორმატში';
 $labels['newcontactgroup'] = 'ახალი საკონტაქტო ჯგუფის შექმნა';
 $labels['grouprename']    = 'ჯგუფის სახელის შეცვლა';
 $labels['groupdelete']    = 'ჯგუფის წაშლა';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
-
 $labels['previouspage']   = 'წინას ჩვენება';
 $labels['firstpage']      = 'პირველის ჩვენება';
 $labels['nextpage']       = 'შემდეგის ჩვენება';
 $labels['lastpage']       = 'ბოლოს ჩვენება';
-
 $labels['group'] = 'ჯგუფი';
 $labels['groups'] = 'ჯგუფები';
-$labels['listgroup'] = 'List group members';
 $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'] = 'კარგი თარიღები';
@@ -400,13 +266,8 @@ $labels['timezone']  = 'დროითი ზონა';
 $labels['pagesize']  = 'სტრიქონი გვერდზე';
 $labels['signature'] = 'ხელმოწერა';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ჩვენება';
 $labels['skin'] = 'ინტერფეისი';
 $labels['logoutclear'] = 'წაშლილების გასუფთავება გამოსვლისას';
@@ -417,21 +278,16 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'არასდროს';
 $labels['immediately']  = 'დაუყონებლივ';
 $labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
@@ -445,15 +301,12 @@ $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'] = 'წაიშალოს ხელმოწერა პასუხის შემთხვევაში';
@@ -461,26 +314,8 @@ $labels['autoaddsignature'] = 'ავტომატურად დაემა
 $labels['newmessageonly'] = 'მხოლოდ ახალი შეტყობინება';
 $labels['replyandforwardonly'] = 'მხოლოდ გადაგზავნის და პასუხის შემთხვევაში';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
-$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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'საქაღალდე';
 $labels['folders']  = 'საქაღალდეები';
 $labels['foldername']  = 'საქაღალდის დასახელება';
@@ -490,54 +325,33 @@ $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['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'საჯარო დასტა';
-
 $labels['sortby'] = 'დალაგება';
 $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'] = 'ვიეტნამური';
 $labels['japanese'] = 'იაპონური';
 $labels['korean'] = 'კორეული';
 $labels['chinese'] = 'ჩინური';
-
 ?>
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index c0cdd98f0..2c544e17d 100755..100644
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -15,9 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'შესვლა შეუძლებელია';
 $messages['cookiesdisabled'] = 'თქვენი ბროუზერი კუკიებს არ პასუხობს';
 $messages['sessionerror'] = 'თქვენი სესია არის მცდარი ან ვადაგასული';
@@ -25,17 +22,11 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'არასწორი მოთხოვნა! მონაცემების შენახვა არ მოხერხდა.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'არ არის ახალი შეტყობინება';
 $messages['loggedout'] = 'წარმატებით დაიხურა თქვენი სესია';
 $messages['mailboxempty'] = 'საფოსტო ყუთი ცარიელია';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'იტვირთება...';
 $messages['uploading'] = 'ფაილი იტვირთება...';
 $messages['uploadingmany'] = 'ფაილების ატვირთვა...';
@@ -48,31 +39,22 @@ $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['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
 $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']  = 'მიუთითეთ სახელი';
@@ -92,45 +74,22 @@ $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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'აღნიშნული მისამართის მხოლოდ წაკითხვაა შესაძლებელი';
 $messages['errorsavingcontact'] = 'საკონტაქტო მისამართის შენახვა შეუძლებელია';
 $messages['movingmessage'] = 'შეტყობინების გადატანა...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
 $messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
 $messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
@@ -142,35 +101,16 @@ $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 bc2836a53..9a2799922 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product សូមស្វាគមន៍';
 $labels['username']  = 'ឈ្មោះអ្នកប្រើ';
 $labels['password']  = 'ពាក្យសំងាត់';
 $labels['server']    = 'ម៉ាស៊ីនមេ';
 $labels['login']     = 'ពិនិត្យចូល';
-
-// taskbar
 $labels['logout']   = 'ពិនិត្យចេញ';
 $labels['mail']     = 'អ៊ីមែល';
 $labels['settings'] = 'កំនត់ការប្រើប្រាស់';
 $labels['addressbook'] = 'សៀវភៅអាសយដ្ឋាន';
-
-// mailbox names
 $labels['inbox']  = 'ប្រអប់សំបុត្រ';
 $labels['drafts'] = 'សំបុត្រពង្រៀង';
 $labels['sent']   = 'សំបុត្រដែលបានបញ្ជូន';
 $labels['trash']  = 'ធុងសំរាម';
 $labels['junk']   = 'សំបុត្រមិនល្អ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'ចំណងជើង';
 $labels['from']    = 'អ្នកផ្ញើ';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'អ្នកទទួល';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -53,28 +41,17 @@ $labels['size']    = 'ទំហំ';
 $labels['priority'] = 'អទិភាព';
 $labels['organization'] = 'អង្គភាព';
 $labels['readstatus'] = 'ស្ថានភាពនៃការអាន';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'ថតទាំងអស់';
 $labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['messagenrof'] = 'សំបុត្រ $nr នៃ $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'ចំលង';
 $labels['move']     = 'ផ្ទេរ';
 $labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ឈ្មោះឯកសារ';
 $labels['filesize'] = 'ទំហំឯកសារ';
-
 $labels['addtoaddressbook'] = 'រក្សាទុកក្នុងសៀវភៅអាសយដ្ឋាន';
-
-// weekdays short
 $labels['sun'] = 'អាទិត្យ';
 $labels['mon'] = 'ច័ន្ទ';
 $labels['tue'] = 'អង្គារ';
@@ -82,8 +59,6 @@ $labels['wed'] = 'ពុធ';
 $labels['thu'] = 'ព្រហស្បតិ៍';
 $labels['fri'] = 'សុក្រ';
 $labels['sat'] = 'សៅរ៍';
-
-// weekdays long
 $labels['sunday']    = 'អាទិត្យ';
 $labels['monday']    = 'ច័ន្ទ';
 $labels['tuesday']   = 'អង្គារ';
@@ -91,8 +66,6 @@ $labels['wednesday'] = 'ពុធ';
 $labels['thursday']  = 'ព្រហស្បតិ៍';
 $labels['friday']    = 'សុក្រ';
 $labels['saturday']  = 'សៅរ៍';
-
-// months short
 $labels['jan']	= 'មករា';
 $labels['feb']	= 'កុម្ភះ';
 $labels['mar']	= 'មិនា';
@@ -105,8 +78,6 @@ $labels['sep']	= 'កញ្ញា';
 $labels['oct']	= 'តុលា';
 $labels['nov']	= 'វិច្ឆិកា';
 $labels['dec']	= 'ធ្នូ';
-
-// months long
 $labels['longjan']	= 'មករា';
 $labels['longfeb']	= 'កុម្ភះ';
 $labels['longmar']	= 'មិនា';
@@ -119,22 +90,14 @@ $labels['longsep']	= 'កញ្ញា';
 $labels['longoct']	= 'តុលា';
 $labels['longnov']	= 'វិច្ឆិកា';
 $labels['longdec']	= 'ធ្នូ';
-
 $labels['today'] = 'ថ្ងៃនេះ';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'ពិនិត្យសំបុត្រថ្មី';
 $labels['compose']          = 'សរសេរសំបុត្រថ្មី';
 $labels['writenewmessage']  = 'សរសេរសំបុត្រថ្មី';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
 $labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
 $labels['replyall']         = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
 $labels['replylist']        = 'ឆ្លើយតបទៅក្រុម';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'ផ្ញើសំបុត្របន្តរ';
 $labels['deletemessage']    = 'លុបសំបុត្រចោល';
 $labels['movemessagetotrash'] = 'ផ្ទេរសំបុត្រទៅក្នុងធុងសំរាម';
@@ -145,17 +108,11 @@ $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'] = 'មិនតំរៀប';
@@ -163,9 +120,7 @@ $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'បានលុបរួច';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
 $labels['filter'] = 'លក្ខខ័ណ្ឌ';
 $labels['list'] = 'តារាង';
@@ -174,7 +129,6 @@ $labels['expand-all'] = 'បង្ហាញសំបុត្រទាំងអ�
 $labels['expand-unread'] = 'បង្ហាញសំបុត្រមិនទាន់អាន';
 $labels['collapse-all'] = 'បិទសំបុត្រទាំងអស់';
 $labels['threaded'] = 'បានបែកចែកជាក្រុមរួច';
-
 $labels['autoexpand_threads'] = 'បង្ហាញបណ្តុំសំបុត្រ';
 $labels['do_expand'] = 'បណ្តុំទាំងអស់';
 $labels['expand_only_unread'] = 'បង្ហាញតែសំបុត្រដែលមិនទាន់អាន';
@@ -190,31 +144,19 @@ $labels['listcolumns'] = 'តារាងជួរឈ';
 $labels['listsorting'] = 'តំរៀបជួរឈ';
 $labels['listorder'] = 'លំដាប់នៃការតំរៀប';
 $labels['listmode'] = 'បង្ហាញជាតារាង';
-
 $labels['folderactions'] = 'មុខងារថត';
 $labels['compact'] = 'បង្រួម';
 $labels['empty'] = 'ទទេរ';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'ទំហំសំបុត្រទាំងអស់ដែលមាន';
 $labels['unknown']  = 'មិនស្គាល់';
 $labels['unlimited']  = 'គ្មានកំនត់';
-
 $labels['quicksearch']  = 'ស្វែងរក';
 $labels['resetsearch']  = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
 $labels['searchmod']  = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
 $labels['msgtext']  = 'សំបុត្រទាំងមូល';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'ផ្ញើសំបុត្រនេះ';
 $labels['savemessage']    = 'រក្សាទុកសំបុត្រពង្រៀង';
 $labels['addattachment']  = 'ឯកសារភ្ជាប់';
@@ -222,54 +164,33 @@ $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['attach'] = 'Attach';
 $labels['attachments'] = 'ឯកសារភ្ជាប់';
 $labels['upload'] = 'ភ្ជាប់ឯកសារ';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'បិទ';
 $labels['messageoptions']  = 'កំណត់ជំរើសរបស់សំបុត្រ';
-
 $labels['low']     = 'ទាប';
 $labels['lowest']  = 'ទាបបំផុត';
 $labels['normal']  = 'ធម្មតា';
 $labels['high']    = 'ខ្ពស់';
 $labels['highest'] = 'ខ្ពស់បំផុត';
-
 $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['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']      = 'នាមខ្លួន';
@@ -299,12 +220,7 @@ $labels['female'] = 'ស្រី';
 $labels['manager'] = 'នាយក';
 $labels['assistant'] = 'ជំនួយការ';
 $labels['spouse'] = 'គ្រួសារ';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
 $labels['other'] = 'ផ្សេងពីនេះ';
-
 $labels['typehome']   = 'គេហដ្ឋាន';
 $labels['typework']   = 'កន្លែងធ្វើការ';
 $labels['typeother']  = 'ផ្សេងពីនេះ';
@@ -316,17 +232,12 @@ $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['cancel'] = 'លះបង់';
 $labels['save']   = 'រក្សាទុក';
@@ -334,64 +245,38 @@ $labels['delete'] = 'លុបចោល';
 $labels['rename'] = 'ប្តូរឈ្មោះ';
 $labels['addphoto'] = 'បន្ថែមរូបថត';
 $labels['replacephoto'] = 'លុបរូបថត';
-$labels['uploadphoto'] = 'Upload photo';
-
 $labels['newcontact']     = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
 $labels['deletecontact']  = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
 $labels['composeto']      = 'ផ្ញើសំបុត្រទៅ';
 $labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ$count';
 $labels['print']          = 'បោះពុម្ភ';
 $labels['export']         = 'ទាញនិងរក្សាទុក';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
 $labels['newcontactgroup'] = 'បង្កើតក្រុមអាសយដ្ឋានថ្មី';
-$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['listgroup'] = 'List group members';
 $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']  = 'ស្វ័យប្រវត្តិ';
@@ -400,13 +285,9 @@ $labels['timezone']  = 'ម៉ោង';
 $labels['pagesize']  = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
 $labels['signature'] = 'ហត្ថលេខា';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុត្រ';
 $labels['skin'] = 'ការរចនាទំព័រ';
 $labels['logoutclear'] = 'សំអាតធុងសំរាមពេលពិនិត្យចេញ';
@@ -424,14 +305,12 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'មិនដែល';
 $labels['immediately']  = 'ភ្លាមៗ';
 $labels['messagesdisplaying'] = 'កំពុងបង្ហាញសំបុត្រ';
@@ -445,15 +324,12 @@ $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'] = 'នៅ​ពេល​ឆ្លើយ​តប​លុប​ហត្ថលេខា​ចេញ​ពីសំបុត្រ';
@@ -466,21 +342,6 @@ $labels['afternseconds']  = 'ក្រោយពី $n វិនាទី';
 $labels['reqmdn'] = 'ក្រោយពី $n វិនាទី';
 $labels['reqdsn'] = 'ក្រោយពី $n វិនាទី';
 $labels['replysamefolder'] = 'ក្រោយពី $n វិនាទី';
-$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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'ថត';
 $labels['folders']  = 'ថតទាំងអស់';
 $labels['foldername']  = 'ឈ្មោះថត';
@@ -497,30 +358,13 @@ $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['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'] = 'អឺរ៉ុបខាងលិច';
@@ -539,5 +383,4 @@ $labels['vietnamese'] = 'ភាសាវៀតណាម';
 $labels['japanese'] = 'ភាសាជប៉ុន';
 $labels['korean'] = 'ភាសាកូរ៉េ';
 $labels['chinese'] = 'ភាសាចិន';
-
 ?>
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index 35bb10244..a2c4bab20 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -15,30 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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'] = 'កំពុងផ្ញើសំបុត្រ...';
@@ -48,27 +38,20 @@ $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'] = 'មិនអាចចំលងសំបុត្របាន';
 $messages['errordeleting'] = 'មិនអាចលុបសំបុត្រចោលបាន';
 $messages['errormarking'] = 'មិនអាចកំណត់ចំណាំលើសំបុត្របាន';
 $messages['deletecontactconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រនេះមែនទេ?';
 $messages['deletefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
 $messages['purgefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
 $messages['foldermoving'] = 'កំពុងផ្ទេរថតសំរាប់ទុកឯកសារ...';
 $messages['foldersubscribing'] = 'កំពុងកំណត់ប្រើថតសំរាប់ទុកឯកសារ...';
@@ -84,9 +67,7 @@ $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'] = 'កំពុងពិនិត្យរក...';
@@ -101,40 +82,24 @@ $messages['converting'] = 'កំពុងលុបការរចនាចោ�
 $messages['messageopenerror'] = 'មិនអាចទាញយកសំបុត្រពីម៉ាស៊ីនមេបានទេ';
 $messages['fileuploaderror'] = 'មិនអាចបញ្ជូលភ្ជាប់ឯកសារ';
 $messages['filesizeerror'] = 'ទំហំឯកសារត្រូវបញ្ជូនលើសចំណុះទំហំធំបំផុតគឺ $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'លោកអ្នកមានសិទ្ធត្រឹមតែមើលប្រភពនៃអាសយដ្ឋាននេះ';
 $messages['errorsavingcontact'] = 'មិនអាចរក្សាអាសយដ្ឋានបានទេ';
 $messages['movingmessage'] = 'កំពុកផ្តេរសំបុត្រ...';
 $messages['copyingmessage'] = 'កំពុងចំលងសំបុត្រ...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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)';
@@ -144,33 +109,19 @@ $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'អាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវទេ:$email';
 $messages['toomanyrecipients'] = 'ចំនួនអ្នកទទួលច្រើនលើសកំនត់!សូមមេត្តាលុបចោលរហូតដល់ $max។';
 $messages['maxgroupmembersreached'] = 'ចំនួនក្រុមលើសកំនត់ហើយចំនួនច្រើនបំផុតគឺ $max';
-$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 60a9275ac..bccd42163 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product에 오신 것을 환영합니다';
 $labels['username']  = '사용자명';
 $labels['password']  = '암호';
 $labels['server']    = '서버';
 $labels['login']     = '로그인';
-
-// taskbar
 $labels['logout']   = '로그아웃';
 $labels['mail']     = '메일';
 $labels['settings'] = '설정';
 $labels['addressbook'] = '주소록';
-
-// mailbox names
 $labels['inbox']  = '받은 편지함';
 $labels['drafts'] = '임시 보관함';
 $labels['sent']   = '보낸 편지함';
 $labels['trash']  = '휴지통';
 $labels['junk']   = '스팸 편지함';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = '특별 폴더에서 실제 이름 보이기';
 $labels['subject'] = '제목';
 $labels['from']    = '보내는 사람';
 $labels['sender']  = '발신인';
@@ -54,13 +44,11 @@ $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
 $labels['readstatus'] = '읽음 상태';
 $labels['listoptions'] = '목록 옵션...';
-
 $labels['mailboxlist'] = '폴더';
 $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']   = '이동할 위치...';
@@ -68,13 +56,9 @@ $labels['download'] = '다운로드';
 $labels['open']     = '열기';
 $labels['showattachment'] = '보기';
 $labels['showanyway'] = '그래도 항상 보기';
-
 $labels['filename'] = '파일명';
 $labels['filesize'] = '파일 크기';
-
 $labels['addtoaddressbook'] = '주소록에 추가';
-
-// weekdays short
 $labels['sun'] = '일';
 $labels['mon'] = '월';
 $labels['tue'] = '화';
@@ -82,8 +66,6 @@ $labels['wed'] = '수';
 $labels['thu'] = '목';
 $labels['fri'] = '금';
 $labels['sat'] = '토';
-
-// weekdays long
 $labels['sunday']    = '일요일';
 $labels['monday']    = '월요일';
 $labels['tuesday']   = '화요일';
@@ -91,8 +73,6 @@ $labels['wednesday'] = '수요일';
 $labels['thursday']  = '목요일';
 $labels['friday']    = '금요일';
 $labels['saturday']  = '토요일';
-
-// months short
 $labels['jan']	= '1월';
 $labels['feb']	= '2월';
 $labels['mar']	= '3월';
@@ -105,8 +85,6 @@ $labels['sep']	= '9월';
 $labels['oct']	= '10월';
 $labels['nov']	= '11월';
 $labels['dec']	= '12월';
-
-// months long
 $labels['longjan']	= '1월';
 $labels['longfeb']	= '2월';
 $labels['longmar']	= '3월';
@@ -119,10 +97,7 @@ $labels['longsep']	= '9월';
 $labels['longoct']	= '10월';
 $labels['longnov']	= '11월';
 $labels['longdec']	= '12월';
-
 $labels['today'] = '오늘';
-
-// toolbar buttons
 $labels['refresh']          = '새로 고침';
 $labels['checkmail']        = '새 메시지 확인';
 $labels['compose']          = '메시지 작성';
@@ -155,7 +130,6 @@ $labels['moreactions']      = '추가 동작...';
 $labels['more']             = '더보기';
 $labels['back']             = '뒤로';
 $labels['options']          = '옵션';
-
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
@@ -163,7 +137,7 @@ $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
 $labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = '첨부파일 포함';
 $labels['deleted'] = '삭제됨';
 $labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
@@ -174,7 +148,6 @@ $labels['expand-all'] = '모두 확장';
 $labels['expand-unread'] = '읽지 않은 메시지 확장';
 $labels['collapse-all'] = '모두 접기';
 $labels['threaded'] = '스레드화됨';
-
 $labels['autoexpand_threads'] = '메시지 스레드 확장';
 $labels['do_expand'] = '모든 스레드';
 $labels['expand_only_unread'] = '읽지 않은 메시지에만 적용';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = '열 목록 보기';
 $labels['listsorting'] = '열 정렬';
 $labels['listorder'] = '정렬 순서';
 $labels['listmode'] = '화면 모드 목록 보기';
-
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
 $labels['empty'] = '비어 있음';
-$labels['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = '메시지 가져오기';
 $labels['quota'] = '디스크 사용량';
 $labels['unknown']  = '알 수 없음';
 $labels['unlimited']  = '제한 없음';
-
 $labels['quicksearch']  = '빠른 검색';
 $labels['resetsearch']  = '검색 재설정';
 $labels['searchmod']  = '수정자 검색';
 $labels['msgtext']  = '전체 메시지';
 $labels['body']  = '본문';
-$labels['type'] = 'Type';
-
+$labels['type'] = '유형';
+$labels['namex'] = '이름';
 $labels['openinextwin'] = '새 창에서 열기';
 $labels['emlsave'] = '다운로드(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
+$labels['changeformattext'] = '메시지를 평문 형식으로 표시';
+$labels['changeformathtml'] = 'HTML 형식으로 표시';
 $labels['editasnew']      = '새 메시지로 편집';
 $labels['send']           = '보내기';
 $labels['sendmessage']    = '메일 보내기';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = '수신 확인';
 $labels['dsn']            = '전송 상태 알림';
 $labels['mailreplyintro'] = '$date에 $sender이(가) 작성한 내용:';
 $labels['originalmessage'] = '원본 메세지';
-
 $labels['editidents']    = '신원 편집';
 $labels['spellcheck']    = '맞춤법';
 $labels['checkspelling'] = '맞춤법 검사하기';
 $labels['resumeediting'] = '편집 계속하기';
 $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['highest'] = '가장 높음';
-
 $labels['nosubject']  = '(제목 없음)';
 $labels['showimages'] = '이미지 보기';
 $labels['alwaysshow'] = '$sender에서 수신된 이미지 항상 보기';
@@ -251,25 +215,19 @@ $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'] = '참고: 이 수신 확인은 이 메시지가 받는 사람의 컴퓨터에 표시되었다는 것만을 의미합니다. 받는 사람이 메시지 내용을 읽거나 이해했다는 보장은 없습니다.';
-
-// address boook
 $labels['name']         = '표시명';
 $labels['firstname']    = '이름';
 $labels['surname']      = '성';
@@ -304,7 +262,6 @@ $labels['search'] = '검색';
 $labels['advsearch'] = '고급 검색';
 $labels['advanced'] = '고급';
 $labels['other'] = '기타';
-
 $labels['typehome']   = '자택';
 $labels['typework']   = '직장';
 $labels['typeother']  = '기타';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = '비서';
 $labels['typehomepage']  = '홈페이지';
 $labels['typeblog'] = '블로그';
 $labels['typeprofile'] = '자기소개';
-
 $labels['addfield'] = '필드 추가..';
 $labels['addcontact'] = '새 연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
 $labels['contactproperties'] = '연락처 속성';
 $labels['personalinfo'] = '개인 정보';
-
 $labels['edit']   = '편집';
 $labels['cancel'] = '취소';
 $labels['save']   = '저장';
@@ -335,7 +290,6 @@ $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '바꾸기';
 $labels['uploadphoto'] = '사진 업로드';
-
 $labels['newcontact']     = '새 연락처 카드 생성';
 $labels['deletecontact']  = '선택한 연락처 삭제';
 $labels['composeto']      = '메일 작성 대상';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = '새 연락처 그룹 생성';
 $labels['grouprename']    = '그룹명 변경';
 $labels['groupdelete']    = '그룹 삭제';
 $labels['groupremoveselected'] = '그룹에서 선택한 연락처 제거';
-
 $labels['previouspage']   = '이전 페이지 보기';
 $labels['firstpage']      = '처음 페이지 보기';
 $labels['nextpage']       = '다음 페이지 보기';
 $labels['lastpage']       = '마지막 페이지 보기';
-
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = '그룹 구성원 목록 보기';
 $labels['personaladrbook'] = '개인 주소';
-
 $labels['searchsave'] = '검색 저장';
 $labels['searchdelete'] = '검색 삭제';
-
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
 $labels['importfromfile'] = '파일에서 가져오기:';
-$labels['importtarget'] = '새 연락처를 주소록에 추가:';
+$labels['importtarget'] = '연락처 추가 위치';
 $labels['importreplace'] = '전체 주소록을 바꾸기';
+$labels['importgroups'] = '그룹 할당 가져오기';
+$labels['importgroupsall'] = '전체 (필요에 따라 그룹 생성)';
+$labels['importgroupsexisting'] = '기존 그룹에만 해당';
 $labels['importdesc'] = '기존 주소록에서 연락처를 가져올 수 있습니다.<br/> 현재 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 데이터 형식에서 주소 가져오기를 지원합니다.\'';
 $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 메시지';
@@ -406,7 +354,7 @@ $labels['htmleditor'] = 'HTML 메시지 작성';
 $labels['htmlonreply'] = 'HTML 메시지 회신 시';
 $labels['htmlonreplyandforward'] = '전달 또는 HTML 메시지 회신 시';
 $labels['htmlsignature'] = 'HTML 서명';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = '이메일 주소를 표시 이름과 함께 보기';
 $labels['previewpane'] = '미리보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
 $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
@@ -476,11 +424,10 @@ $labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시';
 $labels['spellcheckignorecaps'] = '모두 대문자로 표기된 단어 무시';
 $labels['addtodict'] = '사전에 추가';
 $labels['mailtoprotohandler'] = 'mailto: 링크의 프로토콜 처리자 등록';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = '팝업을 일반 창같이 취급';
 $labels['forwardmode'] = '메시지 전달';
 $labels['inline'] = '본문 내용으로';
 $labels['asattachment'] = '첨부파일로';
-
 $labels['folder']  = '폴더';
 $labels['folders']  = '폴더';
 $labels['foldername']  = '폴더명';
@@ -501,26 +448,20 @@ $labels['foldertype'] = '폴더 유형';
 $labels['personalfolder']  = '개인 폴더';
 $labels['otherfolder']  = '다른 사용자의 폴더';
 $labels['sharedfolder']  = '공유 폴더';
-
 $labels['sortby'] = '정렬 방식';
 $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'] = '서유럽어';
@@ -539,5 +480,4 @@ $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 ace6dc8d7..f6f274c43 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = '오류 발생!';
 $messages['loginfailed']  = '로그인이 실패하였습니다.';
 $messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = '요청한 연락처를 찾을 수 없었습니�
 $messages['contactsearchonly'] = '연락처를 찾기 위해 일부 검색용어를 입력하세요.';
 $messages['sendingfailed'] = '메시지 보내기를 실패하였음.';
 $messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다리세요.';
-$messages['errorsavingsent'] = '보낸 메시지를 저장하는 동안 오류가 발생했습니다.';
-$messages['errorsaving'] = '저장 중 오류가 발생했습니다.';
 $messages['errormoving'] = '메시지를 이동할 수 없었음.';
 $messages['errorcopying'] = '메시지를 복사할 수 없었음.';
 $messages['errordeleting'] = '메시지를 삭제할 수 없었음.';
@@ -101,16 +97,16 @@ $messages['converting'] = '서식 설정 삭제 중...';
 $messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없음.';
 $messages['fileuploaderror'] = '파일 업로드를 실패함.';
 $messages['filesizeerror'] = '업로드된 파일이 최대 크기인 $size를 초과하였습니다.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = '$nr개의 연락처를 성공적으로 복사함';
+$messages['movesuccess'] = '$nr개의 연락처를 성공적으로 이동함';
+$messages['copyerror'] = '전체 연락처를 복사할 수 없없음';
+$messages['moveerror'] = '전체 연락처를 이동할 수 없없음';
 $messages['sourceisreadonly'] = '이 주소의 소스는 읽기 전용입니다.';
 $messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없음.';
 $messages['movingmessage'] = '메시지를 이동하는 중...';
 $messages['copyingmessage'] = '메시지 복사하는 중...';
 $messages['copyingcontact'] = '연락처 복사하는 중...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = '연락처 이동 중...';
 $messages['deletingmessage'] = '메시지 삭제하는 중...';
 $messages['markingmessage'] = '메시지에 표시하는 중...';
 $messages['addingmember'] = '그룹에 연락처를 추가하는 중...';
@@ -129,8 +125,8 @@ $messages['importwait'] = '가져오는 중, 기다려주시기 바랍니다...'
 $messages['importformaterror'] = '가져오기를 실패함! 업로드된 파일은 유효하지 않은 가져오기 데이터 파일입니다.';
 $messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져옴<b>';
 $messages['importconfirmskipped'] = '<b>기존 기재사항인 $skipped을(를) 건너뜀</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = '$nr개의 메시지를 성공적으로 가져옴';
+$messages['importmessageerror'] = '가져오기 실패! 업로드된 파일은 유효하지 않은 메시지 또는 메일함 파일임';
 $messages['opnotpermitted'] = '작업이 허가되지 않음!';
 $messages['nofromaddress'] = '선택된 신원에 이메일 주소 가 누락됨.';
 $messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 텍스트 서식이 사라집니다. 계속하시겠습니까?';
@@ -145,7 +141,6 @@ $messages['smtperror'] = 'SMTP 오류: $msg';
 $messages['emailformaterror'] = '유효하지 않은 이메일 주소: $email';
 $messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이세요.';
 $messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원인 $max명을 초과합니다.';
-$messages['internalerror'] = '내부 오류가 발생함. 재시도 해주시기 바랍니다.';
 $messages['contactdelerror'] = '연락처를 삭제할 수 없음.';
 $messages['contactdeleted'] = '연락처가 성공적으로 삭제됨.';
 $messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없음.';
@@ -173,5 +168,4 @@ $messages['parentnotwritable'] = '선택한 상위 폴더에 폴더를 생성/�
 $messages['messagetoobig'] = '메시지 부분이 처리하기에는 너무 큽니다.';
 $messages['attachmentvalidationerror'] = '경고! 이 첨부 파일의 유형이 메시지에서 선언된 유형과 일치하지 않기 때문에 의심됩니다. 발신인을 신뢰할 수 없을 경우, 악성 코드를 포함할 수도 있기 때문에 브라우저에서 열지 않는 것이 좋습니다. <br/><br/><em> 예상한 유형: $expected; 발견된 유형: $found</ em>';
 $messages['noscriptwarning'] = '경고: 이 웹 메일 서비스는 자바스크립트가 필요합니다! 이 기능을 사용하시려면 자바스크립트를 브라우저 설정에서 활성화하시기 바랍니다.';
-
 ?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 6a3c16a5f..c88b52d46 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Hatî';
 $labels['drafts'] = 'Hilanînî';
 $labels['sent']   = 'Şandî';
 $labels['trash']  = 'Çop';
 $labels['junk']   = 'Biikêrnehatî';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Mijar';
 $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['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['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr a peyama $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'Kopiya Karbon';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
-$labels['open']     = 'Open';
-$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ş';
@@ -82,8 +55,6 @@ $labels['wed'] = 'Çş';
 $labels['thu'] = 'Pş';
 $labels['fri'] = 'În';
 $labels['sat'] = 'Şe';
-
-// weekdays long
 $labels['sunday']    = 'Yekşem';
 $labels['monday']    = 'Duşem';
 $labels['tuesday']   = 'Sêşem';
@@ -91,50 +62,12 @@ $labels['wednesday'] = 'Çarş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';
-
-// 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['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ê';
@@ -145,342 +78,94 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendî';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $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['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'Pêvek';
 $labels['upload'] = 'Bar bike';
-$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['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.';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Serast bike';
 $labels['cancel'] = 'Betal';
 $labels['save']   = 'Tomar bike';
 $labels['delete'] = 'Jê Bibe';
-$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['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['listgroup'] = 'List group members';
 $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['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['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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Panela berê nîşan bide';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Peldank';
 $labels['folders']  = 'Peldank';
 $labels['foldername']  = 'Navê peldankê';
@@ -489,55 +174,7 @@ $labels['messagecount'] = 'Peyam';
 $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['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 b3c716466..6000aacb0 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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...';
@@ -48,129 +32,42 @@ $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['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['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['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['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';
 $messages['fileuploaderror'] = 'Barkirina pelê têk çû';
 $messages['filesizeerror'] = 'Pel pir mezin e. Herî zêde divê $size be';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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/lb_LU/labels.inc b/program/localization/lb_LU/labels.inc
index 1dff3a9e7..d32a263a1 100644
--- a/program/localization/lb_LU/labels.inc
+++ b/program/localization/lb_LU/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Wëllkomm bei $product';
 $labels['username']  = 'Benotzernumm';
 $labels['password']  = 'Passwuert';
 $labels['server']    = 'Server';
 $labels['login']     = 'Aloggen';
-
-// taskbar
 $labels['logout']   = 'Ausloggen';
 $labels['mail']     = 'Mailen';
 $labels['settings'] = 'Astellungen';
 $labels['addressbook'] = 'Adressbuch';
-
-// mailbox names
 $labels['inbox']  = 'Mailbox';
 $labels['drafts'] = 'Brouillonen';
 $labels['sent']   = 'Verschéckt';
 $labels['trash']  = 'Poubelle';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Richteg Nimm vu de speziellen Dossieren uweisen';
-
-// message listing
 $labels['subject'] = 'Sujet';
 $labels['from']    = 'Vun';
 $labels['sender']  = 'Geschéckt vun';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritéit';
 $labels['organization'] = 'Organisatioun';
 $labels['readstatus'] = 'Lies-Status';
 $labels['listoptions'] = 'Optiounen oplëschten';
-
 $labels['mailboxlist'] = 'Dossieren';
 $labels['messagesfromto'] = 'Messagen $from bis $to vun $count';
 $labels['threadsfromto'] = 'Diskussiounen $from bis $to vun $count';
 $labels['messagenrof'] = 'Message $nr vun $count';
 $labels['fromtoshort'] = '$from bis $to vun $count';
-
 $labels['copy']     = 'Kopéieren';
 $labels['move']     = 'Réckelen';
 $labels['moveto']   = 'Réckelen an...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Eroflueden';
 $labels['open']     = 'Opmaachen';
 $labels['showattachment'] = 'Weisen';
 $labels['showanyway'] = 'Trotzdeem weisen';
-
 $labels['filename'] = 'Numm vum Fichier';
 $labels['filesize'] = 'Gréisst vum Fichier';
-
 $labels['addtoaddressbook'] = 'An d\'Adressbuch setzen';
-
-// weekdays short
 $labels['sun'] = 'Son';
 $labels['mon'] = 'Méi';
 $labels['tue'] = 'Dën';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Don';
 $labels['thu'] = 'Fre';
 $labels['fri'] = 'Sam';
 $labels['sat'] = 'Son';
-
-// weekdays long
 $labels['sunday']    = 'Sonndeg';
 $labels['monday']    = 'Méindeg';
 $labels['tuesday']   = 'Dënschdeg';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Mëttwoch';
 $labels['thursday']  = 'Donneschdeg';
 $labels['friday']    = 'Freideg';
 $labels['saturday']  = 'Samschdeg';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mäe';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dez';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'Mäerz';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Dezember';
-
 $labels['today'] = 'Haut';
-
-// toolbar buttons
 $labels['refresh']          = 'Nei lueden';
 $labels['checkmail']        = 'Nei Messagen ofruffen';
 $labels['compose']          = 'Schreiwen';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mei Aktiounen...';
 $labels['more']             = 'Méi';
 $labels['back']             = 'Zréck';
 $labels['options']          = 'Optiounen';
-
 $labels['select'] = 'Auswielen';
 $labels['all'] = 'All';
 $labels['none'] = 'Keng';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'All opfächeren';
 $labels['expand-unread'] = 'Ongelies opfächeren';
 $labels['collapse-all'] = 'All zesummefächeren';
 $labels['threaded'] = 'Diskussiounen zesummefaassen';
-
 $labels['autoexpand_threads'] = 'Diskussiounen auserneefächeren';
 $labels['do_expand'] = 'All d\'Diskussiounen';
 $labels['expand_only_unread'] = 'just ongeliese Messagen';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Kolonnen oplëschten';
 $labels['listsorting'] = 'Kolonne sortéieren';
 $labels['listorder'] = 'Sortéier-Reiefolleg';
 $labels['listmode'] = 'Oplëschtungs-Modus';
-
 $labels['folderactions'] = 'Dossiers-Aktiounen...';
 $labels['compact'] = 'Kompaktéieren';
 $labels['empty'] = 'Eidel';
 $labels['importmessages'] = 'Messagen importéieren';
-
 $labels['quota'] = 'Plazverbrauch';
 $labels['unknown']  = 'onbekannt';
 $labels['unlimited']  = 'onlimitéiert';
-
 $labels['quicksearch']  = 'Séier Sich';
 $labels['resetsearch']  = 'Sich zerécksetzen';
 $labels['searchmod']  = 'Sich-Parameter';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Ganze Message';
 $labels['body']  = 'Kierper';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Numm';
-
 $labels['openinextwin'] = 'An enger neier Fënster opmaachen';
 $labels['emlsave'] = 'Eroflueden (.eml)';
 $labels['changeformattext'] = 'Als Text ouni Formatéierungen uweisen';
 $labels['changeformathtml'] = 'Als formatéierten Text uweisen';
-
-// message compose
 $labels['editasnew']      = 'Als nei editéieren';
 $labels['send']           = 'Schécken';
 $labels['sendmessage']    = 'Message schécken';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Empfanksbestätegung';
 $labels['dsn']            = 'Empfanks-Status-Meldung';
 $labels['mailreplyintro'] = 'Den $date, $sender schreift:';
 $labels['originalmessage'] = 'Original-Message';
-
 $labels['editidents']    = 'Identitéiten editéieren';
 $labels['spellcheck']    = 'Orthographie';
 $labels['checkspelling'] = 'Orthographie kontrolléieren';
 $labels['resumeediting'] = 'Weider editéieren';
 $labels['revertto']      = 'Zréck bei';
-
 $labels['attach'] = 'Drunhänken';
 $labels['attachments'] = 'Unhäng';
 $labels['upload'] = 'Eroplueden';
 $labels['uploadprogress'] = '$percent ($current vun $total)';
 $labels['close']  = 'Zoumaachen';
 $labels['messageoptions']  = 'Message-Optiounen...';
-
 $labels['low']     = 'Niddreg';
 $labels['lowest']  = 'Am niddregsten';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Héich';
 $labels['highest'] = 'Am héchsten';
-
 $labels['nosubject']  = '(kee Sujet)';
 $labels['showimages'] = 'Biller uweisen';
 $labels['alwaysshow'] = 'Biller vun $sender ëmmer uweisen';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Dëst ass e Brouillon.';
 $labels['andnmore']   = '$nr more...';
 $labels['togglemoreheaders'] = 'Méi Message-Headeren uweisen';
 $labels['togglefullheaders'] = 'Réi Message-Headeren an-/ausblenden';
-
 $labels['htmltoggle'] = 'Text mat Formatéierungen';
 $labels['plaintoggle'] = 'Text ouni Formatéierungen';
 $labels['savesentmessagein'] = 'Dee verschéckte Message späicheren an';
 $labels['dontsave'] = 'net späicheren';
 $labels['maxuploadsize'] = 'Déi maximal erlaabte Fichiers-Gréisst ass $size';
-
 $labels['addcc'] = 'CC dobäisetzen';
 $labels['addbcc'] = 'BCC dobäisetzen';
 $labels['addreplyto'] = '"Äntwert un" dobäisetzen';
 $labels['addfollowupto'] = '"Noverfollgung un" dobäisetzen';
-
-// mdn
 $labels['mdnrequest'] = 'De Sender vun dësem Message huet gefrot fir informéiert ze gi wann de Message gelies gëtt. Wëlls du de Sender informéieren?';
 $labels['receiptread'] = 'Empfanksbestätegung (gelies)';
 $labels['yourmessage'] = 'Dëst ass eng Empfanksbestätegung fir Äre Message.';
 $labels['receiptnote'] = 'Bemierkung: Dës Bestätegung bezeit just datt de Message beim Empfänger ugewise ginn ass. Et gëtt keng Garantie dass den Empfänger den Inhalt vum Message gelies oder verstanen huet.';
-
-// address boook
 $labels['name']         = 'Ganzen Numm';
 $labels['firstname']    = 'Virnumm';
 $labels['surname']      = 'Nonumm';
@@ -305,7 +262,6 @@ $labels['search'] = 'Sichen';
 $labels['advsearch'] = 'Avancéiert Sich';
 $labels['advanced'] = 'Avancéiert';
 $labels['other'] = 'Aneres';
-
 $labels['typehome']   = 'Doheem';
 $labels['typework']   = 'Aarbecht';
 $labels['typeother']  = 'Aneres';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'Assistent';
 $labels['typehomepage']  = 'Websäit';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
-
 $labels['addfield'] = 'Feld dobäisetzen...';
 $labels['addcontact'] = 'Neie Kontakt dobäisetzen';
 $labels['editcontact'] = 'Kontakt editéieren';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontakt-Eegeschaften';
 $labels['personalinfo'] = 'Perséinlech Informatioun';
-
 $labels['edit']   = 'Änneren';
 $labels['cancel'] = 'Ofbriechen';
 $labels['save']   = 'Späicheren';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Ëmbenennen';
 $labels['addphoto'] = 'Dobäisetzen';
 $labels['replacephoto'] = 'Ersetzen';
 $labels['uploadphoto'] = 'Foto eroplueden';
-
 $labels['newcontact']     = 'Nei Kontakt-Kaart erstellen';
 $labels['deletecontact']  = 'Déi ausgewielte Kontakter läschen';
 $labels['composeto']      = 'Mail schreiwen un';
@@ -350,42 +303,32 @@ $labels['newcontactgroup'] = 'Nei Kontakt-Grupp erstellen';
 $labels['grouprename']    = 'Grupp ëmbenennen';
 $labels['groupdelete']    = 'Grupp läschen';
 $labels['groupremoveselected'] = 'Ausgewielte Kontakter aus Grupp eraushuele';
-
 $labels['previouspage']   = 'Säit virdru weisen';
 $labels['firstpage']      = 'Éischt Säit weisen';
 $labels['nextpage']       = 'Nächst Säit weisen';
 $labels['lastpage']       = 'Lescht Säit weisen';
-
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Gruppen';
 $labels['listgroup'] = 'Gruppe-Memberen oplëschten';
 $labels['personaladrbook'] = 'Perséinlech Adressen';
-
 $labels['searchsave'] = 'Sich späicheren';
 $labels['searchdelete'] = 'Sich läschen';
-
 $labels['import'] = 'Importéieren';
 $labels['importcontacts'] = 'Kontakter importéieren';
 $labels['importfromfile'] = 'Aus Fichier importéieren:';
-$labels['importtarget'] = 'Nei Kontakter an d\'Adressbuch setzen:';
 $labels['importreplace'] = 'Dat ganzt Adressbuch ersetzen';
 $labels['importdesc'] = 'Du kanns Kontakter aus engem existéierenden Adressbuch eroplueden.<br/>Mir ënnerstëtze momentan en Adress-Import vum <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>- oder CSV (mat Komma getrennt)-Date-Format.';
 $labels['done'] = 'Erleedegt';
-
-// settings
 $labels['settingsfor'] = 'Astellunge fir';
 $labels['about'] = 'Iwwert';
 $labels['preferences'] = 'Astellungen';
 $labels['userpreferences'] = 'Benotzer-Astellungen';
 $labels['editpreferences'] = 'Benotzer-Astellungen änneren';
-
 $labels['identities'] = 'Identitéiten';
 $labels['manageidentities'] = 'Identitéite fir dësen Account geréieren';
 $labels['newidentity'] = 'Nei Identitéit';
-
 $labels['newitem'] = 'Neit Element';
 $labels['edititem'] = 'Element änneren';
-
 $labels['preferhtml'] = 'HTML uweisen';
 $labels['defaultcharset'] = 'Standard Zeechesaz';
 $labels['htmlmessage'] = 'HTML-Message';
@@ -481,7 +424,6 @@ $labels['standardwindows'] = 'Popup-Fënstere wéi normal Fënstere behandelen';
 $labels['forwardmode'] = 'Messagë-Weiderleedung';
 $labels['inline'] = 'am Message';
 $labels['asattachment'] = 'als Unhank';
-
 $labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossieren';
 $labels['foldername']  = 'Dossiersnumm';
@@ -502,26 +444,20 @@ $labels['foldertype'] = 'Dossiers-Typ';
 $labels['personalfolder']  = 'Privaten Dossier';
 $labels['otherfolder']  = 'Dossier vun anerem Benotzer';
 $labels['sharedfolder']  = 'Ëffentlechen Dossier';
-
 $labels['sortby'] = 'Sortéieren no';
 $labels['sortasc']  = 'Opsteigend sortéieren';
 $labels['sortdesc'] = 'Ofsteigend sortéieren';
 $labels['undo'] = 'Réckgängeg maachen';
-
 $labels['installedplugins'] = 'Installéiert Plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versioun';
 $labels['source'] = 'Source';
 $labels['license'] = 'Lizenz';
 $labels['support'] = 'Support ufroen';
-
-// units
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-
-// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englesch';
 $labels['westerneuropean'] = 'West-Europäesch';
@@ -540,5 +476,4 @@ $labels['vietnamese'] = 'Vietnamesesch';
 $labels['japanese'] = 'Japanesch';
 $labels['korean'] = 'Koreanesch';
 $labels['chinese'] = 'Chinesesch';
-
 ?>
diff --git a/program/localization/lb_LU/messages.inc b/program/localization/lb_LU/messages.inc
index 5599f227b..8ef0b2f6c 100644
--- a/program/localization/lb_LU/messages.inc
+++ b/program/localization/lb_LU/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Ee Feeler ass opgetrueden!';
 $messages['loginfailed']  = 'Login feelgeschloen.';
 $messages['cookiesdisabled'] = 'Däi Browser acceptéiert keng Cookien.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Den ugefrotene Kontakt gouf net fonnt.';
 $messages['contactsearchonly'] = 'Gëff e puer Sichbegrëffer a fir Kontakter ze fannen';
 $messages['sendingfailed'] = 'De Message konnt net verschéckt ginn.';
 $messages['senttooquickly'] = 'Waart wann ech gelift $sec Sekonn(en) bevir s du de Message verschécks. ';
-$messages['errorsavingsent'] = 'Beim Späichere vum verschéckte Message ass e Feeler opgetrueden';
-$messages['errorsaving'] = 'Beim Späicheren ass e Feeler opgetrueden.';
 $messages['errormoving'] = 'D\'Messagë konnten net verréckelt ginn.';
 $messages['errorcopying'] = 'D\'Messagë konnten net kopéiert ginn.';
 $messages['errordeleting'] = 'D\'Messagë konnten net geläscht ginn.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP-Feeler: $msg';
 $messages['emailformaterror'] = 'Ongëlteg E-Mail-Adress: $email';
 $messages['toomanyrecipients'] = 'Zevill Empfänger. Reduzéier d\'Zuel vun den Empfänger op $max.';
 $messages['maxgroupmembersreached'] = 'D\'Unzuel vu Gruppememberen iwwersteigt de Maximum vun $max.';
-$messages['internalerror'] = 'En interne Feeler ass opgetrueden. Probéier w.e.gl nach eng Kéier.';
 $messages['contactdelerror'] = 'Kontakter konnten net geläscht ginn.';
 $messages['contactdeleted'] = 'Kontakter erfollegräich geläscht.';
 $messages['contactrestoreerror'] = 'Déi geläschte Kontakter konnten net recuperéiert ginn.';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Den Dossier konnt net am ausgewielten Dossier
 $messages['messagetoobig'] = 'Den Messagen-Deel ass ze grouss fir verschafft ze ginn.';
 $messages['attachmentvalidationerror'] = 'WARNUNG! Dësen Unhank ass verdächteg well den tatsächlechen Typ vum Fichier net mam Typ deen am Message deklaréiert ass iwwertenee stëmmt. Falls du dem Ofsender net traus sollts du den Unhank net am Browser opmaache well e béisaartegen Inhalt enthaale kéint.<br/><br/><em>Erwaart: $expected; fonnt: $detected</em>';
 $messages['noscriptwarning'] = 'Warnung: Dëse Webmail brauch JavaScript! Fir de Service benotzen ze kënnen, aktivéier w.e.gl JavaScript an denge Browser-Astellungen.';
-
 ?>
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 31cb44d27..129b0de47 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// 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['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Rodyti tikrus specialiųjų aplankų vardus';
 $labels['subject'] = 'Tema';
 $labels['from']    = 'Siuntėjas';
 $labels['sender']  = 'Siuntėjas';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritetas';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Neskaitytas';
 $labels['listoptions'] = 'Sąrašo nuostatos…';
-
 $labels['mailboxlist'] = 'Aplankai';
 $labels['messagesfromto'] = 'Laiškai nuo $from iki $to iš $count';
 $labels['threadsfromto'] = 'Gijos nuo $from iki $to iš $count';
 $labels['messagenrof'] = 'Laiškas $nr iš $count';
 $labels['fromtoshort'] = '$from – $to iš $count';
-
 $labels['copy']     = 'Kopijuoti';
 $labels['move']     = 'Perkelti';
 $labels['moveto']   = 'Perkelti į…';
@@ -68,13 +56,9 @@ $labels['download'] = 'Parsisiųsti';
 $labels['open']     = 'Atverti';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Tre';
 $labels['thu'] = 'Ket';
 $labels['fri'] = 'Pen';
 $labels['sat'] = 'Šeš';
-
-// weekdays long
 $labels['sunday']    = 'Sekmadienis';
 $labels['monday']    = 'Pirmadienis';
 $labels['tuesday']   = 'Antradienis';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Trečiadienis';
 $labels['thursday']  = 'Ketvirtadienis';
 $labels['friday']    = 'Penktadienis';
 $labels['saturday']  = 'Šeštadienis';
-
-// months short
 $labels['jan']	= 'Sau';
 $labels['feb']	= 'Vas';
 $labels['mar']	= 'Kov';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Rgs';
 $labels['oct']	= 'Spl';
 $labels['nov']	= 'Lap';
 $labels['dec']	= 'Grd';
-
-// months long
 $labels['longjan']	= 'Sausis';
 $labels['longfeb']	= 'Vasaris';
 $labels['longmar']	= 'Kovas';
@@ -119,13 +97,10 @@ $labels['longsep']	= 'Rugsėjis';
 $labels['longoct']	= 'Spalis';
 $labels['longnov']	= 'Lapkritis';
 $labels['longdec']	= 'Gruodis';
-
 $labels['today'] = 'Šiandien';
-
-// toolbar buttons
 $labels['refresh']          = 'Atnaujinti';
 $labels['checkmail']        = 'Tikrinti, ar yra naujų laiškų';
-$labels['compose']          = 'Rašyti naują laišką';
+$labels['compose']          = 'Rašyti';
 $labels['writenewmessage']  = 'Rašyti naują laišką';
 $labels['reply']            = 'Atsakyti';
 $labels['replytomessage']   = 'Atsakyti siuntėjui';
@@ -152,10 +127,9 @@ $labels['markunread']       = 'Kaip neskaitytus';
 $labels['markflagged']      = 'Pažymėti gairele';
 $labels['markunflagged']    = 'Pašalinti gairelę';
 $labels['moreactions']      = 'Kiti veiksmai…';
-$labels['more']             = 'Daugiau';
+$labels['more']             = 'Kita';
 $labels['back']             = 'Grįžti';
 $labels['options']          = 'Nuostatos';
-
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
 $labels['none'] = 'Nerūšiuoti';
@@ -174,7 +148,6 @@ $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ų';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Importuoti laiškus';
 $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['body']  = 'Laiško tekstas';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Tipas';
+$labels['namex'] = 'Vardas';
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
 $labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
 $labels['changeformathtml'] = 'Rodyti HTML formatu';
-
-// message compose
 $labels['editasnew']      = 'Redaguoti kaip naują';
 $labels['send']           = 'Siųsti';
 $labels['sendmessage']    = 'Išsiųsti laiską';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Tikrinti rašybą';
 $labels['resumeediting'] = 'Tęsti redagavimą';
 $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['highest'] = 'Aukščiausias';
-
 $labels['nosubject']  = '(tema nenurodyta)';
 $labels['showimages'] = 'Rodyti paveikslėlius';
 $labels['alwaysshow'] = 'Visada rodyti paveikslėlius $sender laiškuose';
@@ -251,25 +215,19 @@ $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į.';
-
-// address boook
 $labels['name']         = 'Rodomas vardas';
 $labels['firstname']    = 'Vardas';
 $labels['surname']      = 'Pavardė';
@@ -304,7 +262,6 @@ $labels['search'] = 'Paieška';
 $labels['advsearch'] = 'Išplėstinė paieška';
 $labels['advanced'] = 'Išsamiau';
 $labels['other'] = 'Kitas';
-
 $labels['typehome']   = 'Namų';
 $labels['typework']   = 'Darbo';
 $labels['typeother']  = 'Kitas';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Atsisakyti';
 $labels['save']   = 'Įrašyti';
@@ -335,7 +290,6 @@ $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ą';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Kurti adresatų 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['group'] = 'Grupė';
 $labels['groups'] = 'Grupės';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Išvardinti grupės narius';
 $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';
@@ -406,7 +350,7 @@ $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['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Rodyti el. pašto adresą ir asmenvardį';
 $labels['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
 $labels['logoutclear'] = 'Išvalyti Šiukšlinę atsijungiant';
@@ -476,11 +420,10 @@ $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['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Iškylančiuosius langus traktuoti kaip įprastus';
 $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';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Aplanko tipas';
 $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['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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Vietnamiečių';
 $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 7eb31ec3f..f3feedd47 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Įvyko klaida!';
 $messages['loginfailed']  = 'Prisijungti nepavyko.';
 $messages['cookiesdisabled'] = 'Jūsų naršyklė nepriima slapukų.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Ieškotas adresatas nerastas.';
 $messages['contactsearchonly'] = 'Įveskite reikšminius žodžius adresatų paieškai';
 $messages['sendingfailed'] = 'Laiško išsiųsti nepavyko.';
 $messages['senttooquickly'] = 'Turite luktelėti $sec sek., kad galėtumėte išsiųsti laišką.';
-$messages['errorsavingsent'] = 'Įrašant išsiųstą laišką įvyko klaida.';
-$messages['errorsaving'] = 'Įrašant įvyko klaida.';
 $messages['errormoving'] = 'Laiško(-ų) perkelti nepavyko.';
 $messages['errorcopying'] = 'Laiško(-ų) nukopijuoti nepavyko.';
 $messages['errordeleting'] = 'Laiško(-ų) pašalinti nepavyko.';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP klaida: $msg';
 $messages['emailformaterror'] = 'Netinkamas el. pašto adresas: $email';
 $messages['toomanyrecipients'] = 'Per daug gavėjų. Sumažinkite jų bent iki $max.';
 $messages['maxgroupmembersreached'] = 'Grupės narių skaičius viršijo maksimalų leistiną ($max).';
-$messages['internalerror'] = 'Įvyko klaida. Prašom bandyti iš naujo.';
 $messages['contactdelerror'] = 'Nepavyko pašalinti adresato(-ų).';
 $messages['contactdeleted'] = 'Adresatas(-ai) sėkmingai pašalintas(-i).';
 $messages['contactrestoreerror'] = 'Nepavyko atkurti pašalinto(-ų) adresato(-ų).';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Nepavyko sukurti arba perkelti aplanko į pari
 $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 0fe5b0faf..95afc4c49 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Esiet laipni lūgti $product';
 $labels['username']  = 'Lietotājvārds';
 $labels['password']  = 'Parole';
 $labels['server']    = 'Serveris';
 $labels['login']     = 'Autorizēties';
-
-// taskbar
 $labels['logout']   = 'Iziet';
 $labels['mail']     = 'E-pasts';
 $labels['settings'] = 'Iestatījumi';
 $labels['addressbook'] = 'Adrešu grāmata';
-
-// mailbox names
 $labels['inbox']  = 'Ienākošās';
 $labels['drafts'] = 'Uzmetumi';
 $labels['sent']   = 'Nosūtītās';
 $labels['trash']  = 'Papīrgrozs';
 $labels['junk']   = 'Mēstules';
 $labels['show_real_foldernames'] = 'Sistēmas mapēm rādīt īstos nosaukumus';
-
-// message listing
 $labels['subject'] = 'Temats';
 $labels['from']    = 'No';
 $labels['sender']  = 'Sūtītājs';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritāte';
 $labels['organization'] = 'Uzņēmums';
 $labels['readstatus'] = 'Izlasīšanas statuss';
 $labels['listoptions'] = 'Vēstuļu saraksta attēlošanas iestatījumi...';
-
 $labels['mailboxlist'] = '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['fromtoshort'] = '$from – $to no $count';
-
 $labels['copy']     = 'Kopēt';
 $labels['move']     = 'Pārvietot';
 $labels['moveto']   = 'Pārvietot uz...';
@@ -68,13 +56,9 @@ $labels['download'] = 'lejupielādēt';
 $labels['open']     = 'Atvērt';
 $labels['showattachment'] = 'Rādīt';
 $labels['showanyway'] = 'Vienalga rādīt';
-
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'T';
 $labels['thu'] = 'C';
 $labels['fri'] = 'P';
 $labels['sat'] = 'Se';
-
-// weekdays long
 $labels['sunday']    = 'Svētdiena';
 $labels['monday']    = 'Pirmdiena';
 $labels['tuesday']   = 'Otrdiena';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Trešdiena';
 $labels['thursday']  = 'Ceturtdiena';
 $labels['friday']    = 'Piektdiena';
 $labels['saturday']  = 'Sestdiena';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $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';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Septembris';
 $labels['longoct']	= 'Oktobris';
 $labels['longnov']	= 'Novembris';
 $labels['longdec']	= 'Decembris';
-
 $labels['today'] = 'Šodien';
-
-// toolbar buttons
 $labels['refresh']          = 'Atjaunot';
 $labels['checkmail']        = 'Pārbaudīt e-pastu';
 $labels['compose']          = 'Rakstīt vēstuli';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Papildus darbības...';
 $labels['more']             = 'Vairāk';
 $labels['back']             = 'Atpakaļ';
 $labels['options']          = 'Opcijas';
-
 $labels['select'] = 'Atzīmēt';
 $labels['all'] = 'Visas';
 $labels['none'] = 'Nevienu';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Izvērst visus';
 $labels['expand-unread'] = 'Izvērst neizlasītās';
 $labels['collapse-all'] = 'Sakļaut visas';
 $labels['threaded'] = 'Rādīt vijumus';
-
 $labels['autoexpand_threads'] = 'Izvērst vēstuļu vijumus';
 $labels['do_expand'] = 'visus vijumus';
 $labels['expand_only_unread'] = 'tikai ar neizlasītām vēstulēm';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'Saraksta kolonnas';
 $labels['listsorting'] = 'Kārtošanas kolonnas';
 $labels['listorder'] = 'Kārtošanas secība';
 $labels['listmode'] = 'Attēlošanas veids';
-
 $labels['folderactions'] = 'Darbības ar mapēm...';
 $labels['compact'] = 'Saspiest';
 $labels['empty'] = 'Iztukšot';
 $labels['importmessages'] = 'Importēt vēstules';
-
 $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ēšanas modifikatori:';
 $labels['msgtext']  = 'Visā vēstulē';
 $labels['body']  = 'Pamatteksts';
 $labels['type'] = 'Tips';
-
+$labels['namex'] = 'Vārds';
 $labels['openinextwin'] = 'Atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
 $labels['changeformattext'] = 'Rādīt kā neformatētu tekstu';
 $labels['changeformathtml'] = 'Rādīt kā HTML formatētu';
-
-// message compose
 $labels['editasnew']      = 'Rediģēt kā jaunu';
 $labels['send']           = 'Sūtīt';
 $labels['sendmessage']    = 'Sūtīt vēstuli';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'Saņemšanas apstiprinājums';
 $labels['dsn']            = 'Piegādes atskaite';
 $labels['mailreplyintro'] = '$sender @ $date rakstīja:';
 $labels['originalmessage'] = 'Sākotnējā vēstule';
-
 $labels['editidents']    = 'Rediģēt identitātes';
 $labels['spellcheck']    = 'Izrunāt';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
 $labels['resumeediting'] = 'Turpināt rediģēšanu';
 $labels['revertto']      = 'Atgriezt uz';
-
 $labels['attach'] = 'Pievienot';
 $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['highest'] = 'Augstākā';
-
 $labels['nosubject']  = '(bez tēmas)';
 $labels['showimages'] = 'Rādīt attēlus';
 $labels['alwaysshow'] = 'Vienmēr rādīt attēlus vēstulēs, kuras sūtījis $sender';
@@ -251,25 +215,19 @@ $labels['isdraft']    = 'Šis ir melnraksts.';
 $labels['andnmore']   = '$nr vairāk...';
 $labels['togglemoreheaders'] = 'Rādīt galvenes papildus informāciju';
 $labels['togglefullheaders'] = 'Slēpt galvenes papildus informāciju';
-
 $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 Atbildēt-Uz';
 $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 šo apstiprinājumu?';
 $labels['receiptread'] = 'Saņemšanas apstiprinājums';
 $labels['yourmessage'] = 'Šis ir Jūsu nosūtītās vēstules saņemšanas apstiprinājums';
 $labels['receiptnote'] = 'Piezīme: Šis 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 sapratis vēstules saturu.';
-
-// address boook
 $labels['name']         = 'Uzrādītais vārds';
 $labels['firstname']    = 'Vārds';
 $labels['surname']      = 'Uzvārds';
@@ -304,7 +262,6 @@ $labels['search'] = 'Meklēt';
 $labels['advsearch'] = 'Paplašinātā meklēšana';
 $labels['advanced'] = 'Paplašinātie iestatījumi';
 $labels['other'] = 'Cits';
-
 $labels['typehome']   = 'Mājas';
 $labels['typework']   = 'Darbs';
 $labels['typeother']  = 'Cits';
@@ -319,14 +276,12 @@ $labels['typeassistant']  = 'Asistents';
 $labels['typehomepage']  = 'Mājaslapa';
 $labels['typeblog'] = 'Blogs';
 $labels['typeprofile'] = 'Profils';
-
 $labels['addfield'] = 'Pievienot lauku...';
 $labels['addcontact'] = 'Pievienot jaunu kontaktu';
 $labels['editcontact'] = 'Rediģēt kontaktu';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Kontakta īpašības';
 $labels['personalinfo'] = 'Personīgā informācija';
-
 $labels['edit']   = 'Rediģēt';
 $labels['cancel'] = 'Atcelt';
 $labels['save']   = 'Saglabāt';
@@ -335,7 +290,6 @@ $labels['rename'] = 'Pārdēvēt';
 $labels['addphoto'] = 'Pievienot';
 $labels['replacephoto'] = 'Aizvietot';
 $labels['uploadphoto'] = 'Augšupielādēt fotogrāfiju';
-
 $labels['newcontact']     = 'Izveidot jaunu kontaktu';
 $labels['deletecontact']  = 'Dzēst atzīmētos kontaktus';
 $labels['composeto']      = 'Rakstīt vēstuli';
@@ -349,42 +303,35 @@ $labels['newcontactgroup'] = 'Izveidot jaunu kontaktu grupu';
 $labels['grouprename']    = 'Pārdēvēt grupu';
 $labels['groupdelete']    = 'Izdzēst grupu';
 $labels['groupremoveselected'] = 'Dzēst atzīmētos kontaktus no grupas';
-
 $labels['previouspage']   = 'Parādīt iepriekšējo lapu';
 $labels['firstpage']      = 'Parādīt pirmo lapu';
 $labels['nextpage']       = 'Parādīt nākamo lapu';
 $labels['lastpage']       = 'Parādīt pēdējo lapu';
-
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupas';
 $labels['listgroup'] = 'Rādīt grupas kontaktus';
 $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['importtarget'] = 'Kontaktus pievienot';
 $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
+$labels['importgroupsall'] = 'Visus (ja nepieciešams, izveidojiet grupas)';
+$labels['importgroupsexisting'] = 'Tikai esošām grupām';
 $labels['importdesc'] = 'Jūs varat ieimportēt kontaktus no jau esošas adrešu grāmatas.<br/>Uz doto brīdi tiek atbalstīti <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> vai CSV (ar komatu atdalītie) datu formāti.';
 $labels['done'] = 'Pabeigts';
-
-// settings
 $labels['settingsfor'] = 'Iestatījumi';
 $labels['about'] = 'Par';
 $labels['preferences'] = 'Iestatījumi';
 $labels['userpreferences'] = 'Lietotāja iestatījumi';
 $labels['editpreferences'] = 'Rediģēt iestatījumus';
-
 $labels['identities'] = 'Identitātes';
 $labels['manageidentities'] = 'Rediģēt identitātes';
 $labels['newidentity'] = 'Jauna identitāte';
-
 $labels['newitem'] = 'Jauns';
 $labels['edititem'] = 'Rediģēt';
-
 $labels['preferhtml'] = 'Rādīt HTML formatētās vēstules';
 $labels['defaultcharset'] = 'Noklusētā rakstzīmju kopa';
 $labels['htmlmessage'] = 'HTML formatēta vēstule';
@@ -480,7 +427,6 @@ $labels['standardwindows'] = 'Izlēcošie logi kā parasti logi';
 $labels['forwardmode'] = 'Vēstuļu pārsūtīšana';
 $labels['inline'] = 'iekļaujot';
 $labels['asattachment'] = 'kā pielikumu';
-
 $labels['folder']  = 'Mapi';
 $labels['folders']  = 'Mapes';
 $labels['foldername']  = 'Mapes nosaukums';
@@ -501,26 +447,20 @@ $labels['foldertype'] = 'Mapes tips';
 $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['sortdesc'] = 'Kārtot dilstošā secībā';
 $labels['undo'] = 'Atsaukt';
-
 $labels['installedplugins'] = 'Uzstādītie spraudņi';
 $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'] = 'Unikods';
 $labels['english'] = 'Angļu';
 $labels['westerneuropean'] = 'Rietumeiropas';
@@ -539,5 +479,4 @@ $labels['vietnamese'] = 'Vjetnamiešu';
 $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 37ceb0463..f27b01b84 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Radās kļūda!';
 $messages['loginfailed']  = 'Pieslēgties neizdevās';
 $messages['cookiesdisabled'] = 'Jūsu pārlūkprogramma neatbalsta sīkdatnes (cookies)';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Pieprasītais kontakts nav atrasts';
 $messages['contactsearchonly'] = 'Lai atrastu kontaktus, ievadiet meklēšanas kritērijus';
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
 $messages['senttooquickly'] = 'Lūdzu uzgaidiet $sec sekundi(-es) pirms sūtiet šo vēstuli';
-$messages['errorsavingsent'] = 'Saglabājot vēstuli notika kļūda - vēstule netika saglabāta';
-$messages['errorsaving'] = 'Saglabājot notika kļūda';
 $messages['errormoving'] = 'Vēstule(s) netika pārvietota(s)';
 $messages['errorcopying'] = 'Vēstules pārkopēt neizdevās';
 $messages['errordeleting'] = 'Vēstules izdzēst neizdevās';
@@ -101,13 +97,16 @@ $messages['converting'] = 'Tiek noņemts vēstules formatējums...';
 $messages['messageopenerror'] = 'Nevarēja ielādēt vēstuli no servera';
 $messages['fileuploaderror'] = 'Faila augšupielāde neveiksmīga';
 $messages['filesizeerror'] = 'Augšupielādētais fails pārsniedz pieļaujamo $size izmēru.';
-$messages['copysuccess'] = 'Veiksmīgi nokopētas $nr adreses.';
-$messages['copyerror'] = 'Nevarēja nokopēt nevienu adresi.';
+$messages['copysuccess'] = '$nr kontakti tika veiksmīgi pārkopēti.';
+$messages['movesuccess'] = '$nr kontakti tika veiksmīgi pārvietoti.';
+$messages['copyerror'] = 'Kontaktus pārkopēt neizdevās.';
+$messages['moveerror'] = 'Kontaktus pārvietot neizdevās.';
 $messages['sourceisreadonly'] = 'Adreses avots ir lasīšanas režīmā tikai';
 $messages['errorsavingcontact'] = 'Kontakta adresi nevarēja saglabāt.';
 $messages['movingmessage'] = 'Pārvieto vēstules...';
 $messages['copyingmessage'] = 'Kopē vēstules...';
 $messages['copyingcontact'] = 'Kopē kontaktus...';
+$messages['movingcontact'] = 'Pārvieto kontaktu(s)...';
 $messages['deletingmessage'] = 'Dzēš vēstules...';
 $messages['markingmessage'] = 'Atzīmē vēstules...';
 $messages['addingmember'] = 'Kontaktus pievieno grupai...';
@@ -141,7 +140,6 @@ $messages['smtperror'] = 'SMTP kļūda: $msg';
 $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email';
 $messages['toomanyrecipients'] = 'Pārāk daudz saņēmēju. Samaziniet skaitu līdz $max.';
 $messages['maxgroupmembersreached'] = 'Grupas dalībnieku skaits pārsniedz limitu $max.';
-$messages['internalerror'] = 'Notika servera iekšējā kļūda. Lūdzu mēģiniet vēlreiz.';
 $messages['contactdelerror'] = 'Kontaktus izdzēst neizdevās.';
 $messages['contactdeleted'] = 'Kontakti izdzēsti veiksmīgi.';
 $messages['contactrestoreerror'] = 'Izdzēstos kontaktus atjaunot neizdevās.';
@@ -169,5 +167,4 @@ $messages['parentnotwritable'] = 'Neizdevās izveidot/pārvietot mapi atzīmēta
 $messages['messagetoobig'] = 'Vēstule daļa ir pārāk liela, lai to varētu apstrādāt.';
 $messages['attachmentvalidationerror'] = 'BRĪDINĀJUMS! Šis pielikums ir aizdomīgs, jo tā tips neatbilst tipam, kurš ir uzrādīts e-pasta ziņojumā. Ja jūs neuzticaties sūtītājam, šo failu Jums vaļā vērt nevajadzētu, jo tas var saturēt ļaunprātīgu saturu. <br/><br/><em>Būtu jābūt: $expected; Bet ir: $detected</em>';
 $messages['noscriptwarning'] = 'Uzmanību: lai lasītu e-pastus, Jūsu pārlūkprogrammā jābūt ieslēgtiem JavaScript.';
-
 ?>
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 519df5823..2c6c422b3 100755..100644
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Добредојдовте во $product';
 $labels['username']  = 'Корисничко име';
 $labels['password']  = 'Лозинка';
 $labels['server']    = 'Сервер';
 $labels['login']     = 'Најава';
-
-// taskbar
 $labels['logout']   = 'Одјава';
 $labels['mail']     = 'Е-пошта';
 $labels['settings'] = 'Нагодувања';
 $labels['addressbook'] = 'Именик';
-
-// mailbox names
 $labels['inbox']  = 'Примени';
 $labels['drafts'] = 'Непратени';
 $labels['sent']   = 'Пратени';
 $labels['trash']  = 'Корпа';
 $labels['junk']   = 'Ѓубре';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Наслов';
 $labels['from']    = 'Праќач';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Примач';
 $labels['cc']      = 'Копирај';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Препрати на';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Датум';
 $labels['size']    = 'Големина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'Папки';
 $labels['messagesfromto'] = 'Писма од $from до $to од $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Писмо $nr од $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'Копирај';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'Име на податотеката';
 $labels['filesize'] = 'Големина на податотеката';
-
 $labels['addtoaddressbook'] = 'Додај во именик';
-
-// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -82,8 +55,6 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Саб';
-
-// weekdays long
 $labels['sunday']    = 'Недела';
 $labels['monday']    = 'Понеделник';
 $labels['tuesday']   = 'Вторник';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'Среда';
 $labels['thursday']  = 'Четврток';
 $labels['friday']    = 'Петок';
 $labels['saturday']  = 'Сабота';
-
-// months short
 $labels['jan']	= 'Јан';
 $labels['feb']	= 'Фев';
 $labels['mar']	= 'Мар';
@@ -105,8 +74,6 @@ $labels['sep']	= 'Сеп';
 $labels['oct']	= 'Окт';
 $labels['nov']	= 'Ное';
 $labels['dec']	= 'Дек';
-
-// months long
 $labels['longjan']	= 'Јануари';
 $labels['longfeb']	= 'Февруари';
 $labels['longmar']	= 'Март';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'Септември';
 $labels['longoct']	= 'Октомври';
 $labels['longnov']	= 'Ноември';
 $labels['longdec']	= 'Декември';
-
 $labels['today'] = 'Денес';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Провери пошта';
 $labels['compose']          = 'Пиши ново писмо';
 $labels['writenewmessage']  = 'Ново писмо';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'Одговори на испраќачот';
 $labels['replytoallmessage'] = 'Одговори на испраќачот и сите примачи';
-$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'] = 'Премести ги писмата во Корпа';
@@ -145,253 +102,104 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Искористен простор';
 $labels['unknown']  = 'непознато';
 $labels['unlimited']  = 'неограничено';
-
 $labels['quicksearch']  = 'Брзо пребарување';
 $labels['resetsearch']  = 'Ново пребарување';
 $labels['searchmod']  = 'Модификатори на пребарувањето';
 $labels['msgtext']  = 'Цело писмо';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'Приложено';
 $labels['upload'] = 'Подигни';
-$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['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'] = 'Напомена: Ова известување само потврдува дека писмото кое сте го пратиле е отворено. Не е гаранција дека примачот го прочитал или разбрал истото.';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Уреди';
 $labels['cancel'] = 'Откажи';
 $labels['save']   = 'Зачувај';
 $labels['delete'] = 'Избриши';
-$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['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['listgroup'] = 'List group members';
 $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']  = 'Автоматски';
@@ -400,13 +208,8 @@ $labels['timezone']  = 'Часовна зона';
 $labels['pagesize']  = 'Редови по страна';
 $labels['signature'] = 'Потпис';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи прозорец за преглед';
 $labels['skin'] = 'Модел на изгледот';
 $labels['logoutclear'] = 'Исчисти ја Кантата при излез';
@@ -417,43 +220,33 @@ $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['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'] = 'При одговарање отстрани го изворниот потпис од писмото';
@@ -461,26 +254,6 @@ $labels['autoaddsignature'] = 'Автоматски додавај потпис'
 $labels['newmessageonly'] = 'само нови писма';
 $labels['replyandforwardonly'] = 'само одгорови и препраќања';
 $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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Име на папката';
@@ -490,54 +263,11 @@ $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['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 7a7548ce0..d123bada9 100755..100644
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -15,30 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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'] = 'Ја испраќам пораката...';
@@ -48,31 +35,21 @@ $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['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
 $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']  = 'Внесете име';
@@ -86,51 +63,27 @@ $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'] = 'Не можев да го вчитам писното од серверот';
 $messages['fileuploaderror'] = 'Прикачувањето е неуспешно';
 $messages['filesizeerror'] = 'Подигнатата податотека го надминува ограничувањето од $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Изворот на оваа адреса неможе да се промени';
 $messages['errorsavingcontact'] = 'Името неможе да се сними';
 $messages['movingmessage'] = 'Пораката се преместува...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Операцијата не е дозволена';
 $messages['nofromaddress'] = 'Не е внесена е-пошта во одберениот идентитет';
 $messages['editorwarning'] = 'Префрлањето на уредникот на обичен текст ќе резултира со губење на целото форматирање на текстот. Дали сакате да продолжите?';
@@ -142,35 +95,4 @@ $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 7d3fdc501..395893afb 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -15,66 +15,34 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product ലേയ്ക്ക് സ്വാഗതം';
 $labels['username']  = 'ഉപയോക്തൃനാമം';
 $labels['password']  = 'രഹസ്യവാക്ക്';
 $labels['server']    = 'സേവകന്‍';
 $labels['login']     = 'പ്രവേശിക്കുക';
-
-// taskbar
 $labels['logout']   = 'പുറത്ത് കടക്കുക';
 $labels['mail']     = 'തപാല്‍';
 $labels['settings'] = 'ക്രമീകരണങ്ങള്‍';
 $labels['addressbook'] = 'വിലാസ പുസ്തകം';
-
-// mailbox names
 $labels['inbox']  = 'ഇന്‍ബോക്സ്';
 $labels['drafts'] = 'പൂര്‍ത്തിയാകാത്തവ';
 $labels['sent']   = 'അയച്ചവ';
 $labels['trash']  = 'ചവറ്റുകുട്ട';
 $labels['junk']   = 'ആവശ്യമില്ലാത്തവ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'വിഷയം';
 $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['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['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ഫയല്‍ നാമം';
 $labels['filesize'] = 'ഫയലിന്റെ വലിപ്പം';
-
 $labels['addtoaddressbook'] = 'മേല്‍വിലാസങ്ങളില്‍ ചേര്‍ക്കുക.';
-
-// weekdays short
 $labels['sun'] = 'ഞാ';
 $labels['mon'] = 'തി';
 $labels['tue'] = 'ചൊ';
@@ -82,8 +50,6 @@ $labels['wed'] = 'ബു';
 $labels['thu'] = 'വ്യാ';
 $labels['fri'] = 'വെ';
 $labels['sat'] = 'ശ';
-
-// weekdays long
 $labels['sunday']    = 'ഞായര്‍';
 $labels['monday']    = 'തിങ്കള്‍';
 $labels['tuesday']   = 'ചൊവ്വ';
@@ -91,8 +57,6 @@ $labels['wednesday'] = 'ബുധന്‍';
 $labels['thursday']  = 'വ്യാഴം';
 $labels['friday']    = 'വെള്ളി';
 $labels['saturday']  = 'ശനി';
-
-// months short
 $labels['jan']	= 'ജനു';
 $labels['feb']	= 'ഫെബ്';
 $labels['mar']	= 'മാര്‍';
@@ -105,8 +69,6 @@ $labels['sep']	= 'സെപ്റ്റംബര്‍';
 $labels['oct']	= 'ഒക്ടോബര്‍';
 $labels['nov']	= 'നവംബര്‍';
 $labels['dec']	= 'ഡിസംബര്‍';
-
-// months long
 $labels['longjan']	= 'ജനുവരി';
 $labels['longfeb']	= 'ഫെബ്രുവരി';
 $labels['longmar']	= 'മാര്‍ച്ച്';
@@ -119,22 +81,12 @@ $labels['longsep']	= 'സെപ്തംബ‌ര്‍';
 $labels['longoct']	= 'ഒക്ടോബര്‍';
 $labels['longnov']	= 'നവംബ‌ര്‍';
 $labels['longdec']	= 'ഡിസംബ‌ര്‍';
-
 $labels['today'] = 'ഇന്ന്';
-
-// 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'] = 'സന്ദേശം ചവറ്റുകുട്ടയിലേക്ക് നീക്കുക';
@@ -143,19 +95,15 @@ $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'] = 'ഒന്നുമില്ല';
@@ -163,119 +111,54 @@ $labels['currpage'] = 'നിലവിലുളള പേജ്';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'ഡിസ്ക്ക് ഉപയോഗം';
 $labels['unknown']  = 'അറിയാത്ത';
 $labels['unlimited']  = 'പരിമിതികളില്ലാത്ത';
-
 $labels['quicksearch']  = 'പെട്ടെന്ന് തെരയു';
-$labels['resetsearch']  = 'Reset search';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'മുഴുവന്‍ സന്ദേശവും';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'അടയ്ക്കുക';
 $labels['messageoptions']  = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
-
 $labels['low']     = 'കുറഞ്ഞ';
 $labels['lowest']  = 'ഏറ്റവും കുറഞ്ഞ';
 $labels['normal']  = 'സാധാരണ';
 $labels['high']    = 'കൂടിയ';
 $labels['highest'] = 'ഏറ്റവും കൂടിയത്';
-
 $labels['nosubject']  = '(വിഷയം ഇല്ല)';
 $labels['showimages'] = 'ചിത്രങ്ങള്‍ കാണിക്കുക';
-$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['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']   = 'വകുപ്പ്';
@@ -292,19 +175,16 @@ $labels['country']      = 'രാജ്യം';
 $labels['birthday']     = 'പിറന്നാള്‍';
 $labels['anniversary']  = 'വാര്‍ഷികം';
 $labels['website']      = 'വെബ്സൈറ്റ്';
-$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'കുറിപ്പുകള്‍';
 $labels['male']   = 'പുരുഷന്‍';
 $labels['female'] = 'സ്‌ത്രീ';
 $labels['manager'] = 'പരിപാലകന്‍';
 $labels['assistant'] = 'സഹായി';
 $labels['spouse'] = 'ഭാര്യ/ഭര്‍ത്താവ്';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'തെരയുക';
 $labels['advsearch'] = 'വിപുലമായ തിരച്ചില്‍';
 $labels['advanced'] = 'സങ്കീര്‍ണ്ണം';
 $labels['other'] = 'മറ്റുള്ളത്';
-
 $labels['typehome']   = 'ആസ്ഥാനം';
 $labels['typework']   = 'ജോലി';
 $labels['typeother']  = 'മറ്റുള്ളത്';
@@ -319,14 +199,7 @@ $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['cancel'] = 'റദ്ദാക്കുക';
 $labels['save']   = 'സൂക്ഷിക്കുക';
@@ -334,198 +207,58 @@ $labels['delete'] = 'നീക്കം ചെയ്യുക';
 $labels['rename'] = 'പേരുമാറ്റുക';
 $labels['addphoto'] = 'ചേര്‍ക്കുക';
 $labels['replacephoto'] = 'പകരം വയ്ക്കുക';
-$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['listgroup'] = 'List group members';
 $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['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['showemail'] = 'Show email address with display name';
-$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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$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['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'] = 'അറബിക്ക്';
@@ -539,5 +272,4 @@ $labels['vietnamese'] = 'വിയറ്റ്നാമീസ്';
 $labels['japanese'] = 'ജാപ്പനീസ്';
 $labels['korean'] = 'കൊറിയന്‍';
 $labels['chinese'] = 'ചൈനീസ്‌';
-
 ?>
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index cc189a17d..9abaeda99 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -15,162 +15,13 @@
 
  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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 d26583d4d..9eb878782 100755..100644
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -15,66 +15,43 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product वरती स्वागत आहे';
 $labels['username']  = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
 $labels['password']  = 'परवलीचा शब्द';
 $labels['server']    = 'सर्व्हर';
 $labels['login']     = 'प्रवेश';
-
-// taskbar
 $labels['logout']   = 'बाहेर जा';
 $labels['mail']     = 'इ-मेल';
 $labels['settings'] = 'तुमची पसंती';
 $labels['addressbook'] = 'पत्ता नोंदवही';
-
-// mailbox names
 $labels['inbox']  = 'आलेले संदेश';
 $labels['drafts'] = 'मसुदा';
 $labels['sent']   = 'पाठवलेले';
 $labels['trash']  = 'कचरा पेटी';
 $labels['junk']   = 'नको असलेले कचरा संदेश';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'विषय';
 $labels['from']    = 'प्रेषक';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'प्रती';
 $labels['cc']      = 'प्रत';
 $labels['bcc']     = 'गुप्त प्रत';
 $labels['replyto'] = 'यास उत्तर द्या';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'दिनांक';
 $labels['size']    = 'आकार';
 $labels['priority'] = 'प्राधान्य';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'वाचन स्थिती';
 $labels['listoptions'] = 'विकल्प सूची';
-
 $labels['mailboxlist'] = 'फोल्डर्स';
 $labels['messagesfromto'] = 'संदेश $from कडून $to साठी $count वा';
 $labels['threadsfromto'] = 'धागे $from कडून $to साठी $count वा';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'नक्‍कल';
 $labels['move']     = 'हलवा';
 $labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'फाईलचे नाव';
 $labels['filesize'] = 'फाईलचा आकार';
-
 $labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा';
-
-// weekdays short
 $labels['sun'] = 'रवी';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगळ';
@@ -82,8 +59,6 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनी';
-
-// weekdays long
 $labels['sunday']    = 'रविवार';
 $labels['monday']    = 'सोमवार';
 $labels['tuesday']   = 'मंगळवार';
@@ -91,8 +66,6 @@ $labels['wednesday'] = 'बुधवार';
 $labels['thursday']  = 'गुरुवार';
 $labels['friday']    = 'शुक्रवार';
 $labels['saturday']  = 'शनीवार';
-
-// months short
 $labels['jan']	= 'जाने';
 $labels['feb']	= 'फेब्';
 $labels['mar']	= 'मार्च';
@@ -105,8 +78,6 @@ $labels['sep']	= 'सप्टें';
 $labels['oct']	= 'ऑक्टो';
 $labels['nov']	= 'नोव्हें';
 $labels['dec']	= 'डिसें';
-
-// months long
 $labels['longjan']	= 'जानेवारी';
 $labels['longfeb']	= 'फेब्रूवारी';
 $labels['longmar']	= 'मार्च';
@@ -119,10 +90,7 @@ $labels['longsep']	= 'सप्टेंबर';
 $labels['longoct']	= 'ऑक्टोबर';
 $labels['longnov']	= 'नोव्हेंबर';
 $labels['longdec']	= 'डिसेंबर';
-
 $labels['today'] = 'आज';
-
-// toolbar buttons
 $labels['refresh']          = 'अद्ययावत करा';
 $labels['checkmail']        = 'नवीन संदेश आले आहेत का पहा';
 $labels['compose']          = 'नवीन संदेश तयार करा';
@@ -131,10 +99,6 @@ $labels['reply']            = 'उत्तर दया';
 $labels['replytomessage']   = 'पाठवणार्‍याला उत्तर द्या';
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
 $labels['replyall']         = 'सर्वांना उत्तर दया';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'हा संदेश पुढे पाठवा';
 $labels['deletemessage']    = 'संदेश काढून टाका';
 $labels['movemessagetotrash'] = 'संदेश कचरापेटीत टाका';
@@ -155,7 +119,6 @@ $labels['moreactions']      = 'अधिक कृती..';
 $labels['more']             = 'अधिक';
 $labels['back']             = 'मागे';
 $labels['options']          = 'पर्याय';
-
 $labels['select'] = 'निवडा';
 $labels['all'] = 'सर्व';
 $labels['none'] = 'कोणताही नाही';
@@ -163,9 +126,7 @@ $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
@@ -174,7 +135,6 @@ $labels['expand-all'] = 'सर्व विस्‍तारीत करा';
 $labels['expand-unread'] = 'न वाचलेला विस्‍तारा';
 $labels['collapse-all'] = 'सर्व मिटवा';
 $labels['threaded'] = 'धागा लावलेला';
-
 $labels['autoexpand_threads'] = 'संदेश धागे विस्‍तारा';
 $labels['do_expand'] = 'सर्व धागे';
 $labels['expand_only_unread'] = 'फक्‍त न वाचलेल्‍या संदेशांबददल';
@@ -190,31 +150,19 @@ $labels['listcolumns'] = 'सुची स्‍तंभ';
 $labels['listsorting'] = 'स्‍तंभ वर्गीकरण';
 $labels['listorder'] = 'वर्गीकरण क्रम';
 $labels['listmode'] = 'यादी दर्शक पध्‍दत';
-
 $labels['folderactions'] = 'फोल्डर कृती..';
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'डिस्कचा वापर';
 $labels['unknown']  = 'माहित नसलेला';
 $labels['unlimited']  = 'अमर्याद';
-
 $labels['quicksearch']  = 'चटकन शोध';
 $labels['resetsearch']  = 'परत शोध';
 $labels['searchmod']  = 'बदलकर्त्‍यांना शोधा';
 $labels['msgtext']  = 'संपूर्ण संदेश';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'नवीन आहे असा संपादित करा';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'आत्ता पाठवा';
 $labels['savemessage']    = 'हा मसूदा साठवून ठेवा';
 $labels['addattachment']  = 'फाईल सोबत जोडा';
@@ -224,109 +172,75 @@ $labels['returnreceipt']  = 'पोच पावती';
 $labels['dsn']            = 'पोच स्थिती निर्देशक';
 $labels['mailreplyintro'] = '$date या दिवशी $sender ने लिहीले :';
 $labels['originalmessage'] = 'खरा संदेश';
-
 $labels['editidents']    = 'ओळख संपादित करा';
 $labels['spellcheck']    = 'लिखाण';
 $labels['checkspelling'] = 'शुध्द लेखन';
 $labels['resumeediting'] = 'परत संदेश संपादित करा';
 $labels['revertto']      = 'परत जा';
-
 $labels['attach'] = 'जोडा';
 $labels['attachments'] = 'जोडलेल्या';
 $labels['upload'] = 'चढवा';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'बंद';
 $labels['messageoptions']  = 'संदेश पर्याय..';
-
 $labels['low']     = 'कमी';
 $labels['lowest']  = 'कमित कमी';
 $labels['normal']  = 'नेहमी प्रमाणे';
 $labels['high']    = 'तातडीचे';
 $labels['highest'] = 'अतिशय तातडीचे';
-
 $labels['nosubject']  = '(विषय नाही)';
 $labels['showimages'] = 'चित्र दाखवा';
 $labels['alwaysshow'] = '$sender कडून आलेल्या संदेशातील चित्रे नेहमी दाखवा';
 $labels['isdraft']    = 'हा मसुदा संदेश आहे';
-$labels['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'] = 'सूचना: ही पोच पावती तुम्ही ज्यांना  संदेश पाठवला त्यांच्या संगणकावर दिसला एवढेच सांगते. तुम्ही ज्यांना हा संदेश पाठवला, त्यांनी तो वाचला, आणि त्यांना तो नक्की समजला हे मात्र सांगत नाही.';
-
-// 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['female'] = 'स्त्री';
 $labels['manager'] = 'व्यवस्थापक';
 $labels['assistant'] = 'सहाय्यक';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'शोध';
 $labels['advsearch'] = 'प्रगत शोध';
 $labels['advanced'] = 'आधुनिक';
 $labels['other'] = 'इतर';
-
 $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['cancel'] = 'रद्द करा';
 $labels['save']   = 'ठेवून द्या';
@@ -334,64 +248,42 @@ $labels['delete'] = 'काढून टाका';
 $labels['rename'] = 'दूसरे नाव द्या';
 $labels['addphoto'] = 'समावेश करा';
 $labels['replacephoto'] = 'बदला';
-$labels['uploadphoto'] = 'Upload photo';
-
 $labels['newcontact']     = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
 $labels['deletecontact']  = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
 $labels['composeto']      = 'साठी नवीन संदेश तयार करा';
 $labels['contactsfromto'] = '$from पासून ते $to पर्यंत $count पैकी';
 $labels['print']          = 'छापा';
 $labels['export']         = 'निर्यात करा';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
 $labels['newcontactgroup'] = 'नवीन पत्‍त्‍यांचा गट बनवा';
-$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['listgroup'] = 'List group members';
 $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']  = 'स्वयंचलित';
@@ -400,13 +292,8 @@ $labels['timezone']  = 'वेळ  क्षेत्र';
 $labels['pagesize']  = 'प्रत्येक पानावरील ओळी';
 $labels['signature'] = 'सही';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'प्रक्रियापूर्व तावदान दाखवा';
 $labels['skin'] = 'दृष्य गोष्टी';
 $labels['logoutclear'] = 'खात्यातून बाहेर पडतांना कचरा पेटी साफ करा';
@@ -417,21 +304,17 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'कधीच नाही';
 $labels['immediately']  = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
@@ -445,15 +328,12 @@ $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'] = 'उत्‍तर देताना मुळ सही संदेशातून काढून टाका';
@@ -465,22 +345,6 @@ $labels['previewpanemarkread']  = 'प्रदर्शित संदेश �
 $labels['afternseconds']  = '$n क्षणानंतर';
 $labels['reqmdn'] = 'नेहमी पोचपावतीची विनंती करा';
 $labels['reqdsn'] = 'नेहमी पोचपावती स्थिती निर्देशाची विनंती करा';
-$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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'फोल्डर';
 $labels['folders']  = 'फोल्डर्स';
 $labels['foldername']  = 'फोल्डरचे नाव';
@@ -490,37 +354,13 @@ $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['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'] = 'पश्चिम युरोपियन';
@@ -539,5 +379,4 @@ $labels['vietnamese'] = 'व्हिएतनामी';
 $labels['japanese'] = 'जपानी';
 $labels['korean'] = 'कोरियन';
 $labels['chinese'] = 'चिनी';
-
 ?>
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 2b1bd3f33..36eb8dc04 100755..100644
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'काहीतरी चूक झाली';
 $messages['loginfailed']  = 'प्रवेश करता आला नाही';
 $messages['cookiesdisabled'] = 'तुमचा ब्राऊझर कुकीज घेऊ शकत नाही';
@@ -25,20 +23,14 @@ $messages['storageerror'] = 'आयमॅप सर्व्हरशी सं�
 $messages['servererror'] = 'सर्व्‍हर चूक !';
 $messages['servererrormsg'] = 'सर्व्हर चूक : $msg';
 $messages['dberror'] = 'माहितीसाठा चूक !';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'कृती करण्यास असमर्थ, फोल्डर फक्त बघण्यासाठी';
 $messages['errornoperm'] = 'कृती करण्यास असमर्थ, परवानगी अमान्य';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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'] = 'संदेश पाठवत आहे';
@@ -53,11 +45,8 @@ $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'] = 'संदेशांची नक्‍कल करता आली नाही';
 $messages['errordeleting'] = 'संदेश काढून टाकता आला नाही.';
@@ -67,12 +56,8 @@ $messages['deletegroupconfirm']  = 'निवडलेला गट तुम्
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
 $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']  = 'नाव द्या';
@@ -86,14 +71,11 @@ $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'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे.';
@@ -101,20 +83,10 @@ $messages['converting'] = 'दृष्य स्वरुप काढून �
 $messages['messageopenerror'] = 'सर्व्हरवरुन संदेश आणता आला नाही.';
 $messages['fileuploaderror'] = 'फाईल चढवता आली नाही';
 $messages['filesizeerror'] = 'तुम्ही चढवलेली फाईल क्षमतेपेक्षा जास्त मोठी आहे.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'पत्ता फक्त वाचण्यासाठी आहे.';
 $messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही.';
 $messages['movingmessage'] = 'संदेश हलवत आहे..';
 $messages['copyingmessage'] = 'संदेशाची नक्‍कल करत आहे...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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'] = 'तुम्हाला ही ओळख नक्की नष्ट करायची आहे का?';
@@ -124,13 +96,8 @@ $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 $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
 $messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
@@ -144,33 +111,4 @@ $messages['smtperror'] = 'SMTP चूक : $msg';
 $messages['emailformaterror'] = 'अवैध ईमेल पत्‍ता : $email';
 $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 a6bdfbfa0..13d9d89fc 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Peti Masuk';
 $labels['drafts'] = 'Draf';
 $labels['sent']   = 'Hantar';
 $labels['trash']  = 'Tong Sampah';
 $labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Subjek';
 $labels['from']    = 'Daripada';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Kepada';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -54,27 +42,18 @@ $labels['priority'] = 'Prioriti';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status baca';
 $labels['listoptions'] = 'Senarai pilihan';
-
 $labels['mailboxlist'] = '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['download'] = 'Muat Turun';
-$labels['open']     = 'Open';
-$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';
@@ -82,8 +61,6 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kha';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-
-// weekdays long
 $labels['sunday']    = 'Ahad';
 $labels['monday']    = 'Isnin';
 $labels['tuesday']   = 'Selasa';
@@ -91,8 +68,6 @@ $labels['wednesday'] = 'Rabu';
 $labels['thursday']  = 'Khamis';
 $labels['friday']    = 'Jumaat';
 $labels['saturday']  = 'Sabtu';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mac';
@@ -105,8 +80,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dis';
-
-// months long
 $labels['longjan']	= 'Januari';
 $labels['longfeb']	= 'Februari';
 $labels['longmar']	= 'March';
@@ -119,10 +92,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Disember';
-
 $labels['today'] = 'Hari Ini';
-
-// toolbar buttons
 $labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Semak mesej baru';
 $labels['compose']          = 'Karang mesej';
@@ -155,7 +125,6 @@ $labels['moreactions']      = 'Tindakan lanjut..';
 $labels['more']             = 'Seterusnya';
 $labels['back']             = 'Kembali';
 $labels['options']          = 'Opsyen';
-
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tiada';
@@ -163,9 +132,7 @@ $labels['currpage'] = 'Muka terkini';
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Telah dipadam';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
 $labels['filter'] = 'Tapis';
 $labels['list'] = 'Senarai';
@@ -174,7 +141,6 @@ $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';
@@ -190,31 +156,19 @@ $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['importmessages'] = 'Import messages';
-
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Ubah seperti baharu';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Hantar mesej';
 $labels['savemessage']    = 'Simapan sebagai draf';
 $labels['addattachment']  = 'Lampir fail';
@@ -224,191 +178,82 @@ $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['checkspelling'] = 'Semak ejaan';
 $labels['resumeediting'] = 'Sambung pengeditan';
 $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['highest'] = 'Paling Tinggi';
-
 $labels['nosubject']  = '(tiada subjek)';
 $labels['showimages'] = 'Papar imej';
 $labels['alwaysshow'] = 'selalu paparkan imej dari $sender';
 $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.';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Sunting';
 $labels['cancel'] = 'Batal';
 $labels['save']   = 'Simpan';
 $labels['delete'] = 'Padam';
-$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['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['listgroup'] = 'List group members';
 $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['autodetect']  = 'Auto';
 $labels['language']  = 'Bahasa';
 $labels['timezone']  = 'Zon Masa';
 $labels['pagesize']  = 'Baris setiap muka';
 $labels['signature'] = 'Tandatangan';
 $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['showemail'] = 'Show email address with display name';
 $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';
@@ -417,70 +262,11 @@ $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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Kabinet Fail';
 $labels['folders']  = 'Folder';
 $labels['foldername']  = 'Nama Kabinet Fail';
@@ -489,55 +275,7 @@ $labels['messagecount'] = 'Mesej-mesej';
 $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['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 50f10af13..c2140e216 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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...';
@@ -48,129 +32,42 @@ $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['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['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['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['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';
 $messages['fileuploaderror'] = 'Muatnaik fail gagal';
 $messages['filesizeerror'] = 'Fail yang dimuatnaik melampaui saiz maksima $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 b5c8ce4c6..20bbd1383 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
 $labels['sent']   = 'Sendt';
 $labels['trash']  = 'Slettet';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Avsender';
 $labels['sender']  = 'Avsender';
@@ -54,13 +43,11 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lese status';
 $labels['listoptions'] = 'List muligheter';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +55,9 @@ $labels['download'] = 'last ned';
 $labels['open']     = 'Åpen';
 $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';
@@ -82,8 +65,6 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-
-// weekdays long
 $labels['sunday']    = 'Søndag';
 $labels['monday']    = 'Mandag';
 $labels['tuesday']   = 'Tirsdag';
@@ -91,8 +72,6 @@ $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
 $labels['saturday']  = 'Lørdag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +84,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Des';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'Mars';
@@ -119,10 +96,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Desember';
-
 $labels['today'] = 'I dag';
-
-// toolbar buttons
 $labels['refresh']          = 'Oppdater';
 $labels['checkmail']        = 'Se etter nye meldinger';
 $labels['compose']          = 'Skriv ny e-post';
@@ -155,7 +129,6 @@ $labels['moreactions']      = 'Flere handlinger …';
 $labels['more']             = 'Mer';
 $labels['back']             = 'Tilbake';
 $labels['options']          = 'Alternativer';
-
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
@@ -174,7 +147,6 @@ $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';
@@ -190,29 +162,21 @@ $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['importmessages'] = 'Import messages';
-
 $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['body']  = 'Meldingstekst';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst';
 $labels['changeformathtml'] = 'Vis i HTML';
-
-// message compose
 $labels['editasnew']      = 'Rediger som ny';
 $labels['send']           = 'Send.';
 $labels['sendmessage']    = 'Send e-posten';
@@ -224,26 +188,22 @@ $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['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Fortsett redigering';
 $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['highest'] = 'Høyest';
-
 $labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis bilder';
 $labels['alwaysshow'] = 'Vis alltid bilder fra $sender';
@@ -251,25 +211,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Visningsnavn';
 $labels['firstname']    = 'Fornavn';
 $labels['surname']      = 'Etternavn';
@@ -304,7 +258,6 @@ $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Annet';
-
 $labels['typehome']   = 'Hjem';
 $labels['typework']   = 'Jobb';
 $labels['typeother']  = 'Annet';
@@ -319,14 +272,12 @@ $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['cancel'] = 'Avbryt';
 $labels['save']   = 'Lagre';
@@ -335,7 +286,6 @@ $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';
@@ -349,42 +299,31 @@ $labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
 $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['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
-$labels['listgroup'] = 'List group members';
 $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:';
-$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';
@@ -476,11 +415,9 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tall';
 $labels['spellcheckignorecaps'] = 'Ignorer ord med kun store bokstaver';
 $labels['addtodict'] = 'Legg til i ordbok';
 $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenker';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Meldinger videresendes';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-
 $labels['folder']  = 'Mappe';
 $labels['folders']  = 'Mapper';
 $labels['foldername']  = 'Mappenavn';
@@ -501,26 +438,20 @@ $labels['foldertype'] = 'Mappetype';
 $labels['personalfolder']  = 'Privat mappe';
 $labels['otherfolder']  = 'Annen brukers mappe';
 $labels['sharedfolder']  = 'Offentlig mappe';
-
 $labels['sortby'] = 'Sorter etter';
 $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';
@@ -539,5 +470,4 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $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 6138b9379..1d51017fb 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Den ønskede kontakten ble ikke funnet';
 $messages['contactsearchonly'] = 'Skriv inn noen søkeord for å finne kontakter.';
 $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
 $messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
-$messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding';
-$messages['errorsaving'] = 'Det oppstod en feil ved lagring av data';
 $messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
 $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
@@ -101,16 +97,11 @@ $messages['converting'] = 'Fjerner formatering fra meldingen ...';
 $messages['messageopenerror'] = 'Kunne ikke hente meldingen fra server';
 $messages['fileuploaderror'] = 'Feil under opplastning.';
 $messages['filesizeerror'] = 'Filen overstiger maksimum tillatt filstørrelse ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
 $messages['errorsavingcontact'] = 'Kunne ikke lagre kontaktadressen.';
 $messages['movingmessage'] = 'Flytter e-post ...';
 $messages['copyingmessage'] = 'Kopierer e-post...';
 $messages['copyingcontact'] = 'Kopierer kontakt(er) …';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Sletter melding(er) …';
 $messages['markingmessage'] = 'Markerer melding(er) ...';
 $messages['addingmember'] = 'Legger til kontakt(er) i gruppa ...';
@@ -144,7 +135,6 @@ $messages['smtperror'] = 'SMTP-feil ($code): $msg';
 $messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakere. Reduser antall mottakere til $max.';
 $messages['maxgroupmembersreached'] = 'Antall gruppemedlemmer overskrider maksgrensen på $max';
-$messages['internalerror'] = 'Intern feil, prøv igjen senere.';
 $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er)';
 $messages['contactdeleted'] = 'Kontakt(er) slettet uten feil.';
 $messages['contactrestoreerror'] = 'Kunne ikke gjenopprette kontakt(er).';
@@ -172,5 +162,4 @@ $messages['parentnotwritable'] = 'Kunne ikke opprette/flytte mappen i valgt over
 $messages['messagetoobig'] = 'Meldingsdelen er for stor til at den kan prosesseres.';
 $messages['attachmentvalidationerror'] = 'ADVARSEL! Dette vedlegget er mistenkelig fordi det er av en type som ikke passer med det som er deklarert i meldingen. Hvis du ikke stoler på avsenderen burde du ikke åpne det i nettleseren, fordi det kan ha skadelig innhold.<br/><br/><em>Forventet: $expected; fant: $detected</em>rnrnWARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'NB: Denne webmail-klienten krever Javascript! Skru på Javascript i nettleseren din for å kunne bruke den.';
-
 ?>
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 5f69e1916..97f30201b 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -15,34 +15,22 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product मा स्वागत छ';
 $labels['username']  = 'प्रयोगकर्ताको नाम';
 $labels['password']  = 'प्रवेश शब्द';
 $labels['server']    = 'सर्भर';
 $labels['login']     = 'लगइन गर्नुहोस्';
-
-// taskbar
 $labels['logout']   = 'लगआउट गर्नुहोस्';
 $labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'व्यक्तिगत रोजाईहरु';
 $labels['addressbook'] = 'ठेगाना पुस्तिका';
-
-// mailbox names
 $labels['inbox']  = 'प्राप्ति मञ्जूषा';
 $labels['drafts'] = 'ड्राफ्टहरू';
 $labels['sent']   = 'पठईएका मेलहरु';
 $labels['trash']  = 'रद्दी टोकरी';
 $labels['junk']   = 'स्पाम';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'विषय';
 $labels['from']    = 'प्रेषक';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'प्रापक';
 $labels['cc']      = 'बोधार्थ';
 $labels['bcc']     = 'गुप्त बोधार्थ';
@@ -53,28 +41,18 @@ $labels['size']    = 'नाप';
 $labels['priority'] = 'प्राथमिकता';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'पढेको अवस्था';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'फोल्डरहरु';
 $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['download'] = 'डाऊनलोड';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
-
 $labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा भर्नुहोस';
-
-// weekdays short
 $labels['sun'] = 'आइत';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगल';
@@ -82,8 +60,6 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'विहि';
 $labels['fri'] = 'शुक';
 $labels['sat'] = 'शनि';
-
-// weekdays long
 $labels['sunday']    = 'आइतवार';
 $labels['monday']    = 'सोमवार';
 $labels['tuesday']   = 'मंगलवार';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'बुधवार';
 $labels['thursday']  = 'विहिवार';
 $labels['friday']    = 'शुक्रवार';
 $labels['saturday']  = 'शनिवार';
-
-// months short
 $labels['jan']	= 'जनवरी';
 $labels['feb']	= 'फेब्रुवरी';
 $labels['mar']	= 'मार्च';
@@ -105,8 +79,6 @@ $labels['sep']	= 'सेप्टेम्बर';
 $labels['oct']	= 'अक्टोबर';
 $labels['nov']	= 'नोभेम्बर';
 $labels['dec']	= 'डिसेम्बर';
-
-// months long
 $labels['longjan']	= 'जनवरी';
 $labels['longfeb']	= 'फेब्रुवरी';
 $labels['longmar']	= 'मार्च';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'सेप्टेम्बर';
 $labels['longoct']	= 'अक्टोबर';
 $labels['longnov']	= 'नोभेम्बर';
 $labels['longdec']	= 'डिसेम्बर';
-
 $labels['today'] = 'आज';
-
-// toolbar buttons
 $labels['refresh']          = 'ताजा पार्नुहोस्';
 $labels['checkmail']        = 'नया मेल खोज्नुहोस';
 $labels['compose']          = 'रचना गर्नुहोस्';
@@ -147,397 +116,95 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'नपढिएका |';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'डिस्कको उपभोग';
 $labels['unknown']  = 'अज्ञात';
 $labels['unlimited']  = 'अनगिन्ति';
-
 $labels['quicksearch']  = 'स्फुर्ति खोज';
 $labels['resetsearch']  = 'पन: खोज';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'टाँसिएका फाईलहरु';
 $labels['upload'] = 'अपलोड';
-$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['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'] = '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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'सच्याउनुहोस';
 $labels['cancel'] = 'खारेज गर्नुहोस';
 $labels['save']   = 'जोगाउनुहोस';
 $labels['delete'] = 'मेटाउनुहोस';
-$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['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['listgroup'] = 'List group members';
 $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['autodetect']  = 'Auto';
 $labels['language']  = 'भाषा';
 $labels['timezone']  = 'समय क्षेत्र';
 $labels['pagesize']  = 'हरेक पन्नामा यति';
 $labels['signature'] = 'हस्ताक्षर';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'पूर्व दृष्य देखाउनुहोस';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$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['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 bedf41d8d..7873f5715 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = 'मेल पठाईदै रहेको छ...';
@@ -48,129 +32,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'] = '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['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['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['nopagesizewarning'] = 'कृपया पन्नाको नाप भर्नुहोस';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कृपया कम-से-कम एउटा प्रापकको विवरण भर्नुहोस';
 $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 contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'यो ठेगाना को श्रोत पढ्नको लागि मात्र उपलब्ध छ';
 $messages['errorsavingcontact'] = 'स्मपर्कको ठेगाना जोगाउन सकिएन';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 1e6bb2d2f..2e76194e1 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Postvak IN';
 $labels['drafts'] = 'Concepten';
 $labels['sent']   = 'Verzonden berichten';
 $labels['trash']  = 'Prullenbak';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Onderwerp';
 $labels['from']    = 'Van';
 $labels['sender']  = 'Afzender';
@@ -54,27 +43,20 @@ $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['listoptions'] = 'Lijstopties...';
-
 $labels['mailboxlist'] = 'Mappen';
 $labels['messagesfromto'] = 'Berichten $from - $to van $count';
 $labels['threadsfromto'] = 'Conversaties $from - $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
 $labels['fromtoshort'] = '$from - $to van $count';
-
 $labels['copy']     = 'Kopieer';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
-$labels['open']     = 'Open';
 $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';
@@ -82,8 +64,6 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-
-// weekdays long
 $labels['sunday']    = 'Zondag';
 $labels['monday']    = 'Maandag';
 $labels['tuesday']   = 'Dinsdag';
@@ -91,8 +71,6 @@ $labels['wednesday'] = 'Woensdag';
 $labels['thursday']  = 'Donderdag';
 $labels['friday']    = 'Vrijdag';
 $labels['saturday']  = 'Zaterdag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mrt';
@@ -105,8 +83,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Januari';
 $labels['longfeb']	= 'Februari';
 $labels['longmar']	= 'Maart';
@@ -119,10 +95,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'December';
-
 $labels['today'] = 'Vandaag';
-
-// toolbar buttons
 $labels['refresh']          = 'Vernieuwen';
 $labels['checkmail']        = 'Controleer op nieuwe berichten';
 $labels['compose']          = 'Nieuw bericht opstellen';
@@ -133,7 +106,6 @@ $labels['replytoallmessage'] = 'Antwoorden naar lijst of naar afzender en alle o
 $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';
@@ -155,7 +127,6 @@ $labels['moreactions']      = 'Meer acties...';
 $labels['more']             = 'Meer';
 $labels['back']             = 'Terug';
 $labels['options']          = 'Opties';
-
 $labels['select'] = 'Selecteren';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Geen';
@@ -163,7 +134,6 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -174,7 +144,6 @@ $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';
@@ -190,29 +159,18 @@ $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Gebruikte schijfruimte';
 $labels['unknown']  = 'onbekend';
 $labels['unlimited']  = 'onbeperkt';
-
 $labels['quicksearch']  = 'Snelzoeken';
 $labels['resetsearch']  = 'Zoek opnieuw';
 $labels['searchmod']  = 'Zoekopties';
 $labels['msgtext']  = 'Volledig bericht';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
 $labels['send']           = 'Verzenden';
 $labels['sendmessage']    = 'Bericht verzenden';
@@ -224,174 +182,86 @@ $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['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
 $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['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.';
-
-// 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['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Bewerken';
 $labels['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijderen';
 $labels['rename'] = 'Hernoemen';
-$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['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exporteer contactpersonen in vCard formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$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['listgroup'] = 'List group members';
 $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';
@@ -400,13 +270,9 @@ $labels['timezone']  = 'Tijdzone';
 $labels['pagesize']  = 'Berichten per pagina';
 $labels['signature'] = 'Handtekening';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -424,14 +290,12 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nooit';
 $labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichten weergave';
@@ -445,15 +309,12 @@ $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';
@@ -466,21 +327,6 @@ $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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Map';
 $labels['folders']  = 'Mappen';
 $labels['foldername']  = 'Naam';
@@ -497,30 +343,13 @@ $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['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';
@@ -539,5 +368,4 @@ $labels['vietnamese'] = 'Vietnamees';
 $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 f7ed8e8d4..a90e250d9 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Uw browser accepteert geen cookies...';
@@ -28,8 +26,6 @@ $messages['dberror'] = 'Database Fout!';
 $messages['requesttimedout'] = 'Aanvraag verlopen';
 $messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
@@ -56,8 +52,6 @@ $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 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...';
@@ -101,16 +95,11 @@ $messages['converting'] = 'Opmaak van het bericht wordt gewist...';
 $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'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen.';
 $messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren.';
 $messages['movingmessage'] = 'Bericht wordt verplaatst...';
 $messages['copyingmessage'] = 'Bericht wordt gekopieerd...';
 $messages['copyingcontact'] = 'Kopiëren contactpersonen...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Bericht wordt verwijderd...';
 $messages['markingmessage'] = 'Bericht wordt gemarkeerd...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
@@ -129,8 +118,6 @@ $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
 $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?';
@@ -144,7 +131,6 @@ $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.';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te make
 $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 8a6f994fa..f0e4a74b4 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Postvak In';
 $labels['drafts'] = 'Concepten';
 $labels['sent']   = 'Verzonden';
 $labels['trash']  = 'Prullenbak';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Toon echte namen voor speciale mappen';
-
-// message listing
 $labels['subject'] = 'Onderwerp';
 $labels['from']    = 'Afzender';
 $labels['sender']  = 'Afzender';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['listoptions'] = 'Lijstopties...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Download';
 $labels['open']     = 'Openen';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-
-// weekdays long
 $labels['sunday']    = 'zondag';
 $labels['monday']    = 'maandag';
 $labels['tuesday']   = 'dinsdag';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'woensdag';
 $labels['thursday']  = 'donderdag';
 $labels['friday']    = 'vrijdag';
 $labels['saturday']  = 'zaterdag';
-
-// months short
 $labels['jan']	= 'jan';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mrt';
@@ -105,8 +85,6 @@ $labels['sep']	= 'sep';
 $labels['oct']	= 'okt';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'dec';
-
-// months long
 $labels['longjan']	= 'januari';
 $labels['longfeb']	= 'februari';
 $labels['longmar']	= 'maart';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'september';
 $labels['longoct']	= 'oktober';
 $labels['longnov']	= 'november';
 $labels['longdec']	= 'december';
-
 $labels['today'] = 'Vandaag';
-
-// toolbar buttons
 $labels['refresh']          = 'Vernieuwen';
 $labels['checkmail']        = 'Controleer op nieuwe berichten';
 $labels['compose']          = 'Opstellen';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Meer acties...';
 $labels['more']             = 'Meer';
 $labels['back']             = 'Terug';
 $labels['options']          = 'Opties';
-
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteer op kolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Lijstweergave';
-
 $labels['folderactions'] = 'Mapacties...';
 $labels['compact'] = 'Opschonen';
 $labels['empty'] = 'Legen';
 $labels['importmessages'] = 'Berichten importeren';
-
 $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['type'] = 'Type';
-
+$labels['namex'] = 'Naam';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
 $labels['changeformattext'] = 'Weergeven als platte tekst';
 $labels['changeformathtml'] = 'Weergeven als opgemaakte tekst (HTML)';
-
-// message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
 $labels['send']           = 'Verzenden';
 $labels['sendmessage']    = 'Verstuur bericht';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'Ontvangstbevestiging';
 $labels['dsn']            = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
 $labels['originalmessage'] = 'Oorspronkelijke bericht';
-
 $labels['editidents']    = 'Identiteiten bewerken';
 $labels['spellcheck']    = 'Spelling';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Doorgaan met opstellen';
 $labels['revertto']      = 'Terugwijzigen in';
-
 $labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
 $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['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
@@ -251,25 +215,19 @@ $labels['isdraft']    = 'Dit is een conceptbericht.';
 $labels['andnmore']   = '$nr meer...';
 $labels['togglemoreheaders'] = 'Toon meer berichtheaders';
 $labels['togglefullheaders'] = 'Originele berichtheaders aan/uit';
-
 $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'] = '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.';
-
-// address boook
 $labels['name']         = 'Weergavenaam';
 $labels['firstname']    = 'Voornaam';
 $labels['surname']      = 'Achternaam';
@@ -304,7 +262,6 @@ $labels['search'] = 'Zoeken';
 $labels['advsearch'] = 'Geavanceerd zoeken';
 $labels['advanced'] = 'Geavanceerd';
 $labels['other'] = 'Anders';
-
 $labels['typehome']   = 'Thuis';
 $labels['typework']   = 'Werk';
 $labels['typeother']  = 'Anders';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
@@ -335,7 +290,6 @@ $labels['rename'] = 'Hernoemen';
 $labels['addphoto'] = 'Toevoegen';
 $labels['replacephoto'] = 'Vervangen';
 $labels['uploadphoto'] = 'Foto uploaden';
-
 $labels['newcontact']     = 'Voeg een nieuwe contactpersoon toe';
 $labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
 $labels['composeto']      = 'Stuur een bericht naar';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
 $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['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
 $labels['listgroup'] = 'Toon groepsleden';
 $labels['personaladrbook'] = 'Persoonlijk adresboek';
-
 $labels['searchsave'] = 'Zoekopdracht opslaan';
 $labels['searchdelete'] = 'Zoekopdracht verwijderen';
-
 $labels['import'] = 'Importeren';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
-$labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
+$labels['importtarget'] = 'Contacten toevoegen aan';
 $labels['importreplace'] = 'Vervang het complete adresboek';
+$labels['importgroups'] = 'Importeer groepstoewijzingen';
+$labels['importgroupsall'] = 'Allemaal (maak groepen aan indien nodig)';
+$labels['importgroupsexisting'] = 'Alleen voor bestaande groepen';
 $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 berichten in HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard tekenset';
 $labels['htmlmessage'] = 'HTML-bericht';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Behandel pop-ups als normale vensters';
 $labels['forwardmode'] = 'Berichten doorsturen';
 $labels['inline'] = 'invoegen';
 $labels['asattachment'] = 'als bijlage';
-
 $labels['folder']  = 'Map';
 $labels['folders']  = 'Mappen';
 $labels['foldername']  = 'Mapnaam';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Maptype';
 $labels['personalfolder']  = 'Privémap';
 $labels['otherfolder']  = 'Map van andere gebruiker';
 $labels['sharedfolder']  = 'Publieke map';
-
 $labels['sortby'] = 'Sorteer op';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamees';
 $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 01c43b243..22f9e0f6b 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
@@ -172,5 +170,4 @@ $messages['parentnotwritable'] = 'Niet in staat om map aan te maken of verplaats
 $messages['messagetoobig'] = 'Het bericht is te groot om te verwerken.';
 $messages['attachmentvalidationerror'] = 'WAARSCHUWING! Deze bijlage is verdacht omdat het bestandstype niet overeen komt met het bestandstype dat gespecificeerd is in het bericht. Open deze bijlage niet in uw browser als u de afzender niet vertrouwt, aangezien deze bijlage kwaadaardige inhoud kan bevatten.<br /><br /><em>Verwacht: $expected; gevonden: $detected</em>';
 $messages['noscriptwarning'] = 'Waarschuwing: deze webmailapplicatie vereist Javascript! U dient Javascript in te schakelen in uw browserinstellingen wanneer u gebruik wilt maken van deze applicatie.';
-
 ?>
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 5934a01d9..eae5fc639 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
 $labels['sent']   = 'Sendt';
 $labels['trash']  = 'Sletta';
 $labels['junk']   = 'Søppel';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Frå';
 $labels['sender']  = 'Avsendar';
@@ -54,27 +43,20 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lesestatus';
 $labels['listoptions'] = 'Listeinnstillingar …';
-
 $labels['mailboxlist'] = '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['download'] = 'Last ned';
-$labels['open']     = 'Open';
 $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';
@@ -82,8 +64,6 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lau';
-
-// weekdays long
 $labels['sunday']    = 'Sundag';
 $labels['monday']    = 'Måndag';
 $labels['tuesday']   = 'Tysdag';
@@ -91,8 +71,6 @@ $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
 $labels['saturday']  = 'Laurdag';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +83,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Okt';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Des';
-
-// months long
 $labels['longjan']	= 'Januar';
 $labels['longfeb']	= 'Februar';
 $labels['longmar']	= 'Mars';
@@ -119,10 +95,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Oktober';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'Desember';
-
 $labels['today'] = 'I dag';
-
-// toolbar buttons
 $labels['refresh']          = 'Frisk opp att';
 $labels['checkmail']        = 'Sjå etter nye meldingar';
 $labels['compose']          = 'Skriv ei melding';
@@ -155,7 +128,6 @@ $labels['moreactions']      = 'Fleire handlingar';
 $labels['more']             = 'Meir';
 $labels['back']             = 'Tilbake';
 $labels['options']          = 'Innstillingar';
-
 $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
@@ -163,7 +135,6 @@ $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Sletta';
 $labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
@@ -174,7 +145,6 @@ $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';
@@ -190,29 +160,19 @@ $labels['listcolumns'] = 'Vis kolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsveg';
 $labels['listmode'] = 'Listevisningmodus';
-
 $labels['folderactions'] = 'Mappehandlingar';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
-$labels['importmessages'] = 'Import messages';
-
 $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['body']  = 'Meldingstekst';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Rediger som ny';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send meldinga no';
@@ -224,26 +184,22 @@ $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['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Hald fram redigering';
 $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['highest'] = 'Høgast';
-
 $labels['nosubject']  = '(ingen emne)';
 $labels['showimages'] = 'Vis bilete';
 $labels['alwaysshow'] = 'Alltid vis bilete frå $sender';
@@ -251,25 +207,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Visingsnamn';
 $labels['firstname']    = 'Førenamn';
 $labels['surname']      = 'Etternamn';
@@ -304,7 +254,6 @@ $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Andre';
-
 $labels['typehome']   = 'Heim';
 $labels['typework']   = 'Jobb';
 $labels['typeother']  = 'Andre';
@@ -319,14 +268,12 @@ $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['cancel'] = 'Avbryt';
 $labels['save']   = 'Lagre';
@@ -335,7 +282,6 @@ $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';
@@ -349,42 +295,31 @@ $labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
 $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['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppar';
-$labels['listgroup'] = 'List group members';
 $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:';
-$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';
@@ -406,7 +341,6 @@ $labels['htmleditor'] = 'Lag HTML-meldingar';
 $labels['htmlonreply'] = 'ved svar på HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved vidaresending av eller svar på HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Vis førehandsvisningsboks';
 $labels['skin'] = 'Bunad';
 $labels['logoutclear'] = 'Fjern alt i «sletta element» ved utlogging';
@@ -476,11 +410,9 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tal';
 $labels['spellcheckignorecaps'] = 'Ignorer ord med berre store bokstavar';
 $labels['addtodict'] = 'Legg til i ordliste';
 $labels['mailtoprotohandler'] = 'Registrer protokollhandsaming for mailto-lenkjer';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Meldingar vidaresendast';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-
 $labels['folder']  = 'Mappe';
 $labels['folders']  = 'Mapper';
 $labels['foldername']  = 'Mappenamn';
@@ -501,26 +433,20 @@ $labels['foldertype'] = 'Mappetype';
 $labels['personalfolder']  = 'Privat mappe';
 $labels['otherfolder']  = 'Annan brukar si mappe';
 $labels['sharedfolder']  = 'Offentleg mappe';
-
 $labels['sortby'] = 'Sorter etter';
 $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';
@@ -539,5 +465,4 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $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 741b4cb20..5c8386c64 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies).';
@@ -28,8 +26,6 @@ $messages['dberror'] = 'Databasefeil!';
 $messages['requesttimedout'] = 'Førespurnaden fekk tidsavbrot';
 $messages['errorreadonly'] = 'Klarte ikkje utføra handlinga. Mappa kan berre lesast.';
 $messages['errornoperm'] = 'Klarte ikkje utføra handlinga. Nekta tilgang.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
 $messages['invalidhost'] = 'Ugyldig tenarnamn.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
@@ -56,8 +52,6 @@ $messages['contactnotfound'] = 'Fann ikkje kontakten du såg etter.';
 $messages['contactsearchonly'] = 'Skriv søkeord for å finna kontaktar';
 $messages['sendingfailed'] = 'Klarte ikkje senda meldinga.';
 $messages['senttooquickly'] = 'Du må venta $sec sekund for å senda meldinga.';
-$messages['errorsavingsent'] = 'Klarte ikkje lagra den sende meldinga.';
-$messages['errorsaving'] = 'Det skjedde ein feil ved lagring.';
 $messages['errormoving'] = 'Klarte ikkje flytte meldinga(r).';
 $messages['errorcopying'] = 'Klarte ikkje kopiera meldinga(r).';
 $messages['errordeleting'] = 'Klarte ikkje sletta meldinga(r).';
@@ -101,16 +95,11 @@ $messages['converting'] = 'Fjernar formatering frå meldinga …';
 $messages['messageopenerror'] = 'Klarte ikkje lasta meldinga frå tenaren.';
 $messages['fileuploaderror'] = 'Filopplasting feila.';
 $messages['filesizeerror'] = 'Fila du lasta opp, er større enn største tillatne filstorleik, $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Denne adressekjelda er berre lesbar.';
 $messages['errorsavingcontact'] = 'Klarte ikkje lagra kontaktadressa.';
 $messages['movingmessage'] = 'Flyttar melding(ar) …';
 $messages['copyingmessage'] = 'Kopierer melding(ar) …';
 $messages['copyingcontact'] = 'Kopierer kontakt(ar) …';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Slettar melding(ar) …';
 $messages['markingmessage'] = 'Merkar melding(ar) …';
 $messages['addingmember'] = 'Legg til kontakt(ar) i gruppa …';
@@ -129,8 +118,6 @@ $messages['importwait'] = 'Importerer, vent …';
 $messages['importformaterror'] = 'Importering feila. Den opplasta fila er i feil format.';
 $messages['importconfirm'] = '<b>Importerte $inserted kontaktar</b>';
 $messages['importconfirmskipped'] = '<b>Hoppa over $skipped oppføringar som fanst frå før</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Ulovleg operasjon.';
 $messages['nofromaddress'] = 'Manglar e-postadresse i denne identiteten.';
 $messages['editorwarning'] = 'Å byta til rein tekst vil fjerna all tekstformateringa. Vil du halda fram?';
@@ -144,7 +131,6 @@ $messages['smtperror'] = 'SMTP-feil: $msg';
 $messages['emailformaterror'] = 'Ugyldig e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til $max.';
 $messages['maxgroupmembersreached'] = 'Ei gruppe kan ikkje ha fleire enn $max medlemmer.';
-$messages['internalerror'] = 'Intern feil. Prøv igjen.';
 $messages['contactdelerror'] = 'Klarte ikkje sletta kontakt(ar).';
 $messages['contactdeleted'] = 'Kontakt(ar) sletta utan feil.';
 $messages['contactrestoreerror'] = 'Klarte ikkje gjenoppretta kontakt(ar).';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'Klarte ikkje laga/flytte mappa i vald overordn
 $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/csv2vcard.inc b/program/localization/pl_PL/csv2vcard.inc
index ceb995517..c6c5be414 100644
--- a/program/localization/pl_PL/csv2vcard.inc
+++ b/program/localization/pl_PL/csv2vcard.inc
@@ -15,14 +15,7 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
-// This is a list of CSV column names specified in CSV file header
-// These must be original texts used in Outlook/Thunderbird exported csv files
-// Encoding UTF-8
-
 $map = array();
-
-// MS Outlook 2010
 $map['anniversary'] = "Rocznica";
 $map['assistants_name'] = "Asystent";
 $map['assistants_phone'] = "Telefon asystenta";
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index d7b9cd2d4..4c13fb7c6 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Odebrane';
 $labels['drafts'] = 'Kopie robocze';
 $labels['sent']   = 'Wysłane';
 $labels['trash']  = 'Kosz';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Pokaż prawdziwe nazwy dla folderów specjalnych';
-
-// message listing
 $labels['subject'] = 'Temat';
 $labels['from']    = 'Od';
 $labels['sender']  = 'Nadawca';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Priorytet';
 $labels['organization'] = 'Organizacja';
 $labels['readstatus'] = 'Przeczytano';
 $labels['listoptions'] = 'Opcje listy...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Pobierz';
 $labels['open']     = 'Otwórz';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Śr';
 $labels['thu'] = 'Czw';
 $labels['fri'] = 'Pt';
 $labels['sat'] = 'Sb';
-
-// weekdays long
 $labels['sunday']    = 'Niedziela';
 $labels['monday']    = 'Poniedziałek';
 $labels['tuesday']   = 'Wtorek';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Środa';
 $labels['thursday']  = 'Czwartek';
 $labels['friday']    = 'Piątek';
 $labels['saturday']  = 'Sobota';
-
-// months short
 $labels['jan']	= 'sty';
 $labels['feb']	= 'lut';
 $labels['mar']	= 'mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Wrz';
 $labels['oct']	= 'Paź';
 $labels['nov']	= 'Lis';
 $labels['dec']	= 'Gru';
-
-// months long
 $labels['longjan']	= 'styczeń';
 $labels['longfeb']	= 'luty';
 $labels['longmar']	= 'marzec';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'wrzesień';
 $labels['longoct']	= 'październik';
 $labels['longnov']	= 'listopad';
 $labels['longdec']	= 'grudzień';
-
 $labels['today'] = 'Dzisiaj';
-
-// toolbar buttons
 $labels['refresh']          = 'Odśwież';
 $labels['checkmail']        = 'Sprawdź skrzynkę';
 $labels['compose']          = 'Utwórz';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Więcej akcji...';
 $labels['more']             = 'Więcej';
 $labels['back']             = 'Wstecz';
 $labels['options']          = 'Ustawienia';
-
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import wiadomości';
-
 $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['body']  = 'Treść';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Nazwa';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
 $labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
 $labels['changeformathtml'] = 'Wyświetl w formacie HTML';
-
-// message compose
 $labels['editasnew']      = 'Edytuj jako nową';
 $labels['send']           = 'Wyślij';
 $labels['sendmessage']    = 'Wyślij teraz';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Sprawdź pisownię';
 $labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
 $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['highest'] = 'Bardzo wysoki';
-
 $labels['nosubject']  = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Nazwa';
 $labels['firstname']    = 'Imię';
 $labels['surname']      = 'Nazwisko';
@@ -304,7 +262,6 @@ $labels['search'] = 'Szukaj';
 $labels['advsearch'] = 'Wyszukiwanie zaawansowane';
 $labels['advanced'] = 'Zaawansowane';
 $labels['other'] = 'Inne';
-
 $labels['typehome']   = 'Dom';
 $labels['typework']   = 'Praca';
 $labels['typeother']  = 'Inne';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Anuluj';
 $labels['save']   = 'Zapisz';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Utwórz nową 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['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
 $labels['listgroup'] = 'Członkowie grupy';
 $labels['personaladrbook'] = 'Kontakty osobiste';
-
 $labels['searchsave'] = 'Zapisz wyszukiwanie';
 $labels['searchdelete'] = 'Usuń wyszukiwanie';
-
 $labels['import'] = 'Importuj';
 $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
-$labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
+$labels['importtarget'] = 'Dodaj kontakty do';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
+$labels['importgroups'] = 'Importuj powiązania z grupami';
+$labels['importgroupsall'] = 'Wszystkie (utwórz grupy jeśli potrzeba)';
+$labels['importgroupsexisting'] = 'Tylko do isniejących grup';
 $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';
@@ -414,7 +362,7 @@ $labels['logoutcompact'] = 'Przy wylogowaniu porządkuj folder Odebrane';
 $labels['uisettings'] = 'Interfejs użytkownika';
 $labels['serversettings'] = 'Ustawienia serwera';
 $labels['mailboxview'] = 'Widok skrzynki pocztowej';
-$labels['mdnrequests'] = 'Na żadanie potwierdzenia odbioru';
+$labels['mdnrequests'] = 'Na żądanie potwierdzenia odbioru';
 $labels['askuser'] = 'pytaj mnie';
 $labels['autosend'] = 'wyślij potwierdzenie';
 $labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów, pytaj o pozostałe';
@@ -441,7 +389,7 @@ $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
 $labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
-$labels['advancedoptions'] = 'opcje zaawansowane';
+$labels['advancedoptions'] = 'Opcje zaawansowane';
 $labels['focusonnewmessage'] = 'Informuj przeglądarkę o nowej wiadomości';
 $labels['checkallfolders'] = 'Sprawdzaj czy nadeszły nowe wiadomości we wszystkich folderach';
 $labels['displaynext'] = 'Po usunięciu/przeniesieniu wiadomości wyświetl następną';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Traktuj okna wyskakujące jako standardowe okna';
 $labels['forwardmode'] = 'Przekazywanie wiadomości';
 $labels['inline'] = 'w treści';
 $labels['asattachment'] = 'jako załącznik';
-
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Foldery';
 $labels['foldername']  = 'Nazwa folderu';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Typ folderu';
 $labels['personalfolder']  = 'Folder prywatny';
 $labels['otherfolder']  = 'Folder innego użytkownika';
 $labels['sharedfolder']  = 'Folder współdzielony';
-
 $labels['sortby'] = 'Sortuj wg';
 $labels['sortasc']  = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
 $labels['undo'] = 'Cofnij';
-
 $labels['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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'wietnamski';
 $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 3cac0c426..0ad357b69 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
@@ -101,13 +99,16 @@ $messages['converting'] = 'Konwertowanie tekstu...';
 $messages['messageopenerror'] = 'Nie można załadować wiadomości z serwera.';
 $messages['fileuploaderror'] = 'Załączanie pliku nie powiodło się.';
 $messages['filesizeerror'] = 'Plik przekracza maksymalną wielkość $size.';
-$messages['copysuccess'] = 'Pomyślnie skopiowano następującą liczbę adresów: $nr.';
-$messages['copyerror'] = 'Nie można skopiować żadnego adresu.';
+$messages['copysuccess'] = 'Pomyślnie skopiowano $nr kontaktów.';
+$messages['movesuccess'] = 'Pomyślnie przeniesiono $nr kontaktów.';
+$messages['copyerror'] = 'Nie udało się skopiować żadnego kontaktu.';
+$messages['moveerror'] = 'Nie udało się przenieść żadnego kontaktu.';
 $messages['sourceisreadonly'] = 'Źródło adresu jest tylko do odczytu.';
 $messages['errorsavingcontact'] = 'Nie można było zapisać adresu kontaktu.';
 $messages['movingmessage'] = 'Przenoszenie wiadomości...';
 $messages['copyingmessage'] = 'Kopiowanie wiadomości...';
 $messages['copyingcontact'] = 'Kopiowanie kontaktów...';
+$messages['movingcontact'] = 'Przenoszenie kontaktów...';
 $messages['deletingmessage'] = 'Usuwanie wiadomości...';
 $messages['markingmessage'] = 'Oznaczanie wiadomości...';
 $messages['addingmember'] = 'Dodawanie kontaktów do grupy...';
@@ -167,7 +168,6 @@ $messages['invalidimageformat'] = 'Niepoprawny format obrazka.';
 $messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
 $messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.';
 $messages['messagetoobig'] = 'Ta część wiadomości jest zbyt duża aby ją przetworzyć.';
-$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, bo może zawierać złośliwe oprogramowanie.<br/><br/><em>Spodziwany: $expected; znaleziono: $detected</em>';
+$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, gdyż może zawierać złośliwe oprogramowanie.<br/><br/><em>Zadeklarowany: $expected; wykryty: $detected</em>';
 $messages['noscriptwarning'] = 'Uwaga: Usługa wymaga Javascriptu! Aby z niej skorzystać proszę włączyć obsługę języka Javascript w ustawieniach przeglądarki.';
-
 ?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index d5e513419..9b4c8d813 100755..100644
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product ته ښه راغلاست';
 $labels['username']  = 'کارن نوم';
 $labels['password']  = 'پټنوم';
 $labels['server']    = 'برابرونکی';
 $labels['login']     = 'ننوتون';
-
-// taskbar
 $labels['logout']   = 'وتون';
 $labels['mail']     = 'برېښناليک';
 $labels['settings'] = 'ځاني برابرونې';
 $labels['addressbook'] = 'پتې کتاب';
-
-// mailbox names
 $labels['inbox']  = 'راغلي ليکونه';
 $labels['drafts'] = 'بارليک';
 $labels['sent']   = 'لېږل شوي ليکونه';
 $labels['trash']  = 'کثافت دانۍ';
 $labels['junk']   = 'جنک';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'مضمون';
 $labels['from']    = 'استوونکی';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ترلاسه کوونکی';
 $labels['cc']      = 'لمېسل';
 $labels['bcc']     = 'پټليکی';
 $labels['replyto'] = 'ځوابول';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'نېټه';
 $labels['size']    = 'کچه';
 $labels['priority'] = 'لومړيتوب';
 $labels['organization'] = 'ټولنه';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'پوښۍ';
 $labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'له $nr ځخه استوزو $count استوزو ته';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'لمېسل';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'فايل نوم';
 $labels['filesize'] = 'فايل کچه';
-
 $labels['addtoaddressbook'] = 'د پتو کتاب ته يې ورزيات کړئ';
-
-// weekdays short
 $labels['sun'] = 'يوه نۍ';
 $labels['mon'] = 'دوه نۍ';
 $labels['tue'] = 'درې نۍ';
@@ -82,8 +55,6 @@ $labels['wed'] = 'څلورنۍ';
 $labels['thu'] = 'پنځنۍ';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'نۍ';
-
-// weekdays long
 $labels['sunday']    = 'يوه نۍ';
 $labels['monday']    = 'دوه نۍ';
 $labels['tuesday']   = 'درې نۍ';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'منځنۍ';
 $labels['thursday']  = 'پنځنۍ';
 $labels['friday']    = 'جمعه';
 $labels['saturday']  = 'نۍ';
-
-// months short
 $labels['jan']	= 'حنوري';
 $labels['feb']	= 'فبروري';
 $labels['mar']	= 'مارچ';
@@ -105,8 +74,6 @@ $labels['sep']	= 'سپتمپر';
 $labels['oct']	= 'اکتوبر';
 $labels['nov']	= 'نومبر';
 $labels['dec']	= 'ډسمبر';
-
-// months long
 $labels['longjan']	= 'جنوري';
 $labels['longfeb']	= 'فبروري';
 $labels['longmar']	= 'مارچ';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'سپتمبر';
 $labels['longoct']	= 'اکتوبر';
 $labels['longnov']	= 'نومبر';
 $labels['longdec']	= 'ډسمبر';
-
 $labels['today'] = 'نن';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'نوي استوزي وګوره';
 $labels['compose']          = 'استوزه وليکه';
 $labels['writenewmessage']  = 'نوي استوزي جوړول';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'استوونکي ته ځواب ورکړئ';
 $labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
-$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'] = 'استوزه کثافت داني ته واستوه';
@@ -145,253 +102,98 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'ټيکلي لارښود';
 $labels['unknown']  = 'نامعلوم';
 $labels['unlimited']  = 'بي کچه';
-
 $labels['quicksearch']  = 'ژر پلټنه';
 $labels['resetsearch']  = 'د پلټنې بياسمون';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'نښلني';
 $labels['upload'] = 'پورته کول';
-$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['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'] = 'يادونه: دا رسليک تاسې ته يوازې ددې خبرتيا درکوي چې کله استوزی د ترلاسه کوونکي په کمپيوټر کې څرګند شي،  ددې هيڅ ډاډګيرنه نشته چې ترلاسه کوونکي د  استوزي متن لوستی او يا پرې پوه شوی دی';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'سمون';
 $labels['cancel'] = 'لري کول';
 $labels['save']   = 'ساتل';
 $labels['delete'] = 'ړنګول';
-$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['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['listgroup'] = 'List group members';
 $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']  = 'په خپلواکه توګه';
@@ -400,13 +202,8 @@ $labels['timezone']  = 'سيميز وخت';
 $labels['pagesize']  = 'په هر مخ پرتې کښې';
 $labels['signature'] = 'لاسليک';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټرفيس بڼه';
 $labels['logoutclear'] = 'کثافت داني د وتنې په وخت کې پاکه کړه';
@@ -417,70 +214,26 @@ $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['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['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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'پوښۍ';
 $labels['folders']  = 'پوښۍ';
 $labels['foldername']  = 'پوښۍ نوم';
@@ -490,54 +243,11 @@ $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['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 50c1849bd..a900d328f 100755..100644
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = 'استوزه استوي.';
@@ -48,31 +32,20 @@ $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['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['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']  = 'مهرباني‌وکړئ يو نوم وليکئ';
@@ -84,93 +57,29 @@ $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'] = 'له سرور څخه استوزي پرمخ نه شي تلی';
 $messages['fileuploaderror'] = 'دفايل پورته کول په بري سره سرته ونه رسيده';
 $messages['filesizeerror'] = 'د پورته شوي فايل کچه بايد لږترلږه له $څخه تيری ونه کړي';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'ددې پتې يوازې سرچينه لوستل کېږي';
 $messages['errorsavingcontact'] = 'د پتې اړيکلوری يې خوندي‌نه شو کړای';
 $messages['movingmessage'] = 'استوزه خوځوي';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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 3c486d5ad..13db63e99 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Rascunhos';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Lixeira';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Exibir o nome real das pastas de sistema';
-
-// message listing
 $labels['subject'] = 'Assunto';
 $labels['from']    = 'De';
 $labels['sender']  = 'Remetente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Status de leitura';
 $labels['listoptions'] = 'Lista de opções...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Baixar';
 $labels['open']     = 'Abrir';
 $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.';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Qua.';
 $labels['thu'] = 'Qui.';
 $labels['fri'] = 'Sex.';
 $labels['sat'] = 'Sáb.';
-
-// weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Segunda-feira';
 $labels['tuesday']   = 'Terça-feira';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Quarta-feira';
 $labels['thursday']  = 'Quinta-feira';
 $labels['friday']    = 'Sexta-feira';
 $labels['saturday']  = 'Sábado';
-
-// months short
 $labels['jan']	= 'Jan.';
 $labels['feb']	= 'Fev.';
 $labels['mar']	= 'Mar.';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Set.';
 $labels['oct']	= 'Out.';
 $labels['nov']	= 'Nov.';
 $labels['dec']	= 'Dez.';
-
-// months long
 $labels['longjan']	= 'Janeiro';
 $labels['longfeb']	= 'Fevereiro';
 $labels['longmar']	= 'Março';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Setembro';
 $labels['longoct']	= 'Outubro';
 $labels['longnov']	= 'Novembro';
 $labels['longdec']	= 'Dezembro';
-
 $labels['today'] = 'Hoje';
-
-// toolbar buttons
 $labels['refresh']          = 'Atualizar';
 $labels['checkmail']        = 'Verificar se há novas mensagens';
 $labels['compose']          = 'Criar email';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mais ações...';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
-
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
@@ -174,7 +148,6 @@ $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 grupos';
 $labels['expand_only_unread'] = 'somente com mensagem(s) não lidas';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Coluna para ordenação';
 $labels['listorder'] = 'Ordem da classificação';
 $labels['listmode'] = 'Visualização em lista';
-
 $labels['folderactions'] = 'Ações para as pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
 $labels['importmessages'] = 'Importar mensagens';
-
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconhecido';
 $labels['unlimited']  = 'ilimitado';
-
 $labels['quicksearch']  = 'Pesquisa rápida';
 $labels['resetsearch']  = 'Limpar pesquisa';
 $labels['searchmod']  = 'Opções da pesquisa';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Mensagem inteira';
 $labels['body']  = 'Conteúdo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nome';
-
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
 $labels['changeformattext'] = 'Exibir em formato de texto simples';
 $labels['changeformathtml'] = 'Exibir com formatação HTML';
-
-// message compose
 $labels['editasnew']      = 'Editar como novo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar agora';
@@ -225,26 +192,22 @@ $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['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
 $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['highest'] = 'Mais alta';
-
 $labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
@@ -252,25 +215,19 @@ $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 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.';
-
-// address boook
 $labels['name']         = 'Nome';
 $labels['firstname']    = 'Primeiro Nome';
 $labels['surname']      = 'Sobrenome';
@@ -305,7 +262,6 @@ $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa Avançada';
 $labels['advanced'] = 'Avançado';
 $labels['other'] = 'Outro';
-
 $labels['typehome']   = 'Residencial';
 $labels['typework']   = 'Trabalho';
 $labels['typeother']  = 'Outro';
@@ -320,14 +276,12 @@ $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['cancel'] = 'Cancelar';
 $labels['save']   = 'Salvar';
@@ -336,7 +290,6 @@ $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';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Criar novo grupo de contatos';
 $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['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Listar membros do grupo';
 $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:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Todos (criar grupo se necessário)';
 $labels['importgroupsexisting'] = 'Somente para grupos existentes';
 $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';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Usar popups como janelas do navegador';
 $labels['forwardmode'] = 'Encaminhamento de mensagens';
 $labels['inline'] = 'Em linha (no corpo da mensagem)';
 $labels['asattachment'] = 'como anexo';
-
 $labels['folder']  = 'Pasta';
 $labels['folders']  = 'Pastas';
 $labels['foldername']  = 'Nome da pasta';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Tipo de Pasta';
 $labels['personalfolder']  = 'Pasta Particular';
 $labels['otherfolder']  = 'Pasta de outro Usuário';
 $labels['sharedfolder']  = 'Pasta Pública';
-
 $labels['sortby'] = 'Ordenar por';
 $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';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 45b835d44..2f5782373 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Seu navegador não aceita cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'O contato solicitado não foi encontrado.';
 $messages['contactsearchonly'] = 'Informe os termos de pesquisa para localizar os contatos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem.';
 $messages['senttooquickly'] = 'Aguarde $sec s para enviar a mensagem.';
-$messages['errorsavingsent'] = 'Ocorreu um erro ao salvar a mensagem enviada.';
-$messages['errorsaving'] = 'Ocorreu um erro ao salvar.';
 $messages['errormoving'] = 'Não foi possível mover a(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).';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de e-mail inválido: $email';
 $messages['toomanyrecipients'] = 'Há muitos destinatários. Reduza o número de destinatários para $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max';
-$messages['internalerror'] = 'Ocorreu um erro interno. Por favor tente novamente.';
 $messages['contactdelerror'] = 'Não foi possível excluir o(s) contato(s).';
 $messages['contactdeleted'] = 'Contato(s) excluído(s) com sucesso.';
 $messages['contactrestoreerror'] = 'Não foi possivel recuperar o(s) contato(s) excluído(s).';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Sem permissão para criar/mover a pasta dentro
 $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 cc4c534e0..b12830031 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'A Receber';
 $labels['drafts'] = 'Rascunhos';
 $labels['sent']   = 'Itens Enviados';
 $labels['trash']  = 'Reciclagem';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Mostrar nomes reais para as pastas especiais';
-
-// message listing
 $labels['subject'] = 'Assunto';
 $labels['from']    = 'Remetente';
 $labels['sender']  = 'Remetente';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Estado de leitura';
 $labels['listoptions'] = 'Lista de opções...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'descarregar';
 $labels['open']     = 'Abrir';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Qua';
 $labels['thu'] = 'Qui';
 $labels['fri'] = 'Sex';
 $labels['sat'] = 'Sáb';
-
-// weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Segunda-feira';
 $labels['tuesday']   = 'Terça-feira';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Quarta-feira';
 $labels['thursday']  = 'Quinta-feira';
 $labels['friday']    = 'Sexta-feira';
 $labels['saturday']  = 'Sábado';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Fev';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Set';
 $labels['oct']	= 'Out';
 $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dez';
-
-// months long
 $labels['longjan']	= 'Janeiro';
 $labels['longfeb']	= 'Fevereiro';
 $labels['longmar']	= 'Março';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Setembro';
 $labels['longoct']	= 'Outubro';
 $labels['longnov']	= 'Novembro';
 $labels['longdec']	= 'Dezembro';
-
 $labels['today'] = 'Hoje';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Verificar existência de novas mensagens';
 $labels['compose']          = 'Nova mensagem';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Mais acções...';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
-
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhum';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Importar mensagens';
-
 $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['body']  = 'Corpo';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Tipo';
+$labels['namex'] = 'Nome';
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
 $labels['changeformattext'] = 'Mostrar em formato de texto simples';
 $labels['changeformathtml'] = 'Mostrar em formato HTML';
-
-// message compose
 $labels['editasnew']      = 'Editar como nova';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
 $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['highest'] = 'Muito alta';
-
 $labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Mostrar imagens';
 $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Nome completo';
 $labels['firstname']    = 'Primeiro nome';
 $labels['surname']      = 'Apelido';
@@ -304,7 +262,6 @@ $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa avançada';
 $labels['advanced'] = 'Pesquisa avançada';
 $labels['other'] = 'Outro';
-
 $labels['typehome']   = 'Residência';
 $labels['typework']   = 'Empresa';
 $labels['typeother']  = 'Outro';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Criar novo grupo de contactos';
 $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['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Lista de membros do grupo';
 $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:';
-$labels['importtarget'] = 'Adicionar novo contacto ao livro de endereços:';
+$labels['importtarget'] = 'Adicionar contactos a';
 $labels['importreplace'] = 'Substituir todo o livro de endereços.';
+$labels['importgroups'] = 'Importar atribuições de grupo';
+$labels['importgroupsall'] = 'Todos (criar grupos se necessário)';
+$labels['importgroupsexisting'] = 'Apenas para grupos existentes';
 $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';
@@ -415,8 +363,8 @@ $labels['uisettings'] = 'Interface do utilizador';
 $labels['serversettings'] = 'Definições do servidor';
 $labels['mailboxview'] = 'Visualização da Caixa de Entrada';
 $labels['mdnrequests'] = 'Enviar notificações';
-$labels['askuser'] = 'perguntar ao ultilizador';
-$labels['autosend'] = 'enviar automáticamente';
+$labels['askuser'] = 'perguntar ao utilizador';
+$labels['autosend'] = 'enviar automaticamente';
 $labels['autosendknown'] = 'enviar recibo de leitura apenas para os meus contactos';
 $labels['autosendknownignore'] = 'enviar recibo para os meus contactos, caso contrário, ignorar';
 $labels['ignore'] = 'ignorar';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Lidar com popups como janelas padrão';
 $labels['forwardmode'] = 'Reencaminhamento de mensagens';
 $labels['inline'] = 'em linha';
 $labels['asattachment'] = 'como anexo';
-
 $labels['folder']  = 'Pasta';
 $labels['folders']  = 'Pastas';
 $labels['foldername']  = 'Nome da pasta';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Tipo de pasta';
 $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['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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamita';
 $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 f0855096e..06e78198d 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'O seu navegador não suporta cookies';
@@ -56,8 +54,8 @@ $messages['contactnotfound'] = 'O contacto especificado não foi encontrado';
 $messages['contactsearchonly'] = 'Insira os termos de pesquisa para localizar os contactos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem';
 $messages['senttooquickly'] = 'Por favor espere $sec seg(s) antes de enviar esta mensagem';
-$messages['errorsavingsent'] = 'Ocorreu um erro ao guardar a mensagem enviada';
-$messages['errorsaving'] = 'Ocorreu um erro ao guardar';
+$messages['errorsavingsent'] = 'Ocorreu um erro ao gravar a mensagem enviada.';
+$messages['errorsaving'] = 'Ocorreu um erro ao gravar.';
 $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';
@@ -172,5 +170,4 @@ $messages['parentnotwritable'] = 'Não é possível criar/mover esta pasta para
 $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 c357aabeb..953cfe8da 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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ă';
-
-// mailbox names
 $labels['inbox']  = 'Primite';
 $labels['drafts'] = 'Ciorne';
 $labels['sent']   = 'Trimise';
 $labels['trash']  = 'Gunoi';
 $labels['junk']   = 'Spam';
 $labels['show_real_foldernames'] = 'Arata numele reale pentru folderele speciale';
-
-// message listing
 $labels['subject'] = 'Subiect';
 $labels['from']    = 'Expeditor';
 $labels['sender']  = 'Expeditor';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organizaţie';
 $labels['readstatus'] = 'Citit/Necitit';
 $labels['listoptions'] = 'Listează opţiunile...';
-
 $labels['mailboxlist'] = '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'] = 'Mesajul $nr din $count';
 $labels['fromtoshort'] = '$from - $to din $count';
-
 $labels['copy']     = 'Copiază';
 $labels['move']     = 'Mută';
 $labels['moveto']   = 'Mută in...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Descarcă';
 $labels['open']     = 'Deschide';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Joi';
 $labels['fri'] = 'Vin';
 $labels['sat'] = 'Sâm';
-
-// weekdays long
 $labels['sunday']    = 'Duminică';
 $labels['monday']    = 'Luni';
 $labels['tuesday']   = 'Marţi';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Miercuri';
 $labels['thursday']  = 'Joi';
 $labels['friday']    = 'Vineri';
 $labels['saturday']  = 'Sâmbătă';
-
-// months short
 $labels['jan']	= 'Ian';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Sep';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Noi';
 $labels['dec']	= 'Dec';
-
-// months long
 $labels['longjan']	= 'Ianuarie';
 $labels['longfeb']	= 'Februarie';
 $labels['longmar']	= 'Martie';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Septembrie';
 $labels['longoct']	= 'Octombrie';
 $labels['longnov']	= 'Noiembrie';
 $labels['longdec']	= 'Decembrie';
-
 $labels['today'] = 'Astăzi';
-
-// toolbar buttons
 $labels['refresh']          = 'Actualizează';
 $labels['checkmail']        = 'Verifică mesaje noi';
 $labels['compose']          = 'Scrie un mesaj';
@@ -155,7 +130,6 @@ $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'] = 'Niciunul';
@@ -174,7 +148,6 @@ $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';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Arată coloane';
 $labels['listsorting'] = 'Sortează după';
 $labels['listorder'] = 'Ordinea de sortare';
 $labels['listmode'] = 'Mod de vizualizare';
-
 $labels['folderactions'] = 'Acțiuni dosar...';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
 $labels['importmessages'] = 'Import mesaje';
-
 $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';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Tot mesajul';
 $labels['body']  = 'Corp';
 $labels['type'] = 'Tip';
 $labels['namex'] = 'Nume';
-
 $labels['openinextwin'] = 'Deschide în fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
 $labels['changeformattext'] = 'Afișează în format text';
 $labels['changeformathtml'] = 'Afișează în format HTML';
-
-// message compose
 $labels['editasnew']      = 'Editează ca nou';
 $labels['send']           = 'Trimite';
 $labels['sendmessage']    = 'Trimite mesaj';
@@ -225,26 +192,22 @@ $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['checkspelling'] = 'Verifică ortografie';
 $labels['resumeediting'] = 'Reia editarea';
 $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['highest'] = 'Cea mai mare';
-
 $labels['nosubject']  = '(fără subiect)';
 $labels['showimages'] = 'Afişează imagini';
 $labels['alwaysshow'] = 'Afişează întotdeauna imaginile de la $sender';
@@ -252,25 +215,19 @@ $labels['isdraft']    = 'Acest mesaj este o ciornă.';
 $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 trimise î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-La';
-
-// 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.';
-
-// address boook
 $labels['name']         = 'Numele Contact';
 $labels['firstname']    = 'Nume';
 $labels['surname']      = 'Prenume';
@@ -305,7 +262,6 @@ $labels['search'] = 'Căutare';
 $labels['advsearch'] = 'Căutare avansată';
 $labels['advanced'] = 'Avansat';
 $labels['other'] = 'Altele';
-
 $labels['typehome']   = 'Acasă';
 $labels['typework']   = 'Serviciu';
 $labels['typeother']  = 'Altele';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'Asistent';
 $labels['typehomepage']  = 'Pagină de pornire';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
-
 $labels['addfield'] = 'Adaugă câmp...';
 $labels['addcontact'] = 'Adaugă contact nou';
 $labels['editcontact'] = 'Modifică contact';
 $labels['contacts'] = 'Contacte';
 $labels['contactproperties'] = 'Proprietăţile contactului...';
 $labels['personalinfo'] = 'Informații personale';
-
 $labels['edit']   = 'Editează';
 $labels['cancel'] = 'Renunţă';
 $labels['save']   = 'Salvează';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Redenumeşte';
 $labels['addphoto'] = 'Adaugă';
 $labels['replacephoto'] = 'Înlocuiește';
 $labels['uploadphoto'] = 'Încarcă imagine';
-
 $labels['newcontact']     = 'Creează contact nou';
 $labels['deletecontact']  = 'Şterge contactul selectat';
 $labels['composeto']      = 'Compune e-mail pentru';
@@ -350,20 +303,16 @@ $labels['newcontactgroup'] = 'Creează un nou grup de contacte';
 $labels['grouprename']    = 'Redenumește grupul';
 $labels['groupdelete']    = 'Șterge grupul';
 $labels['groupremoveselected'] = 'Șterge contactele selectate din grup';
-
 $labels['previouspage']   = 'Pagina anterioară';
 $labels['firstpage']      = 'Prima pagină';
 $labels['nextpage']       = 'Pagina următoare';
 $labels['lastpage']       = 'Ultima pagină';
-
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grupuri';
 $labels['listgroup'] = 'Lista membrii grupului';
 $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:';
@@ -374,21 +323,16 @@ $labels['importgroupsall'] = 'Toate (creează grupurile dacă este necesar)';
 $labels['importgroupsexisting'] = 'Doar pentru grupurile existente';
 $labels['importdesc'] = 'Puteți încărca 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';
@@ -484,7 +428,6 @@ $labels['standardwindows'] = 'Trateaza popupsurile ca ferestre standard';
 $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';
@@ -505,26 +448,20 @@ $labels['foldertype'] = 'Tip dosar';
 $labels['personalfolder']  = 'Dosar privat';
 $labels['otherfolder']  = 'Dosarul altui utilizator';
 $labels['sharedfolder']  = 'Dosar public';
-
 $labels['sortby'] = 'Sortează după';
 $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';
@@ -543,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamez';
 $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 96b9de593..c3e74597f 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Browserul dumneavoastră nu acceptă cookies';
@@ -25,13 +23,13 @@ $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['requesttimedout'] = 'Timpul alocat cererii a expirat';
+$messages['errorreadonly'] = 'Nu se poate efectua operaţiunea. Dosarul este disponibil doar pentru citire.';
+$messages['errornoperm'] = 'Nu se poate efectua operaţiunea. Acces interzis.';
+$messages['erroroverquota'] = 'Nu se poate efectua operația. Nu există spațiu liber.';
+$messages['erroroverquotadelete'] = 'Nu există spațiu liber. Folosiți SHIFT+DEL pentru a șterge un mesaj.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
-$messages['invalidhost'] = 'Hosname invalid';
+$messages['invalidhost'] = 'Nume server 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ă';
@@ -40,34 +38,32 @@ $messages['loading'] = 'Se încarcă...';
 $messages['uploading'] = 'Fişierul se încarcă...';
 $messages['uploadingmany'] = 'Încarc fişierele...';
 $messages['loadingdata'] = 'Se încarcă informaţiile...';
-$messages['checkingmail'] = 'Se caută mesaje noi...';
+$messages['checkingmail'] = 'Se verifică pentru mesaje noi...';
 $messages['sendingmessage'] = 'Trimitere mesaj...';
 $messages['messagesent'] = 'Mesajul a fost trimis cu succes!';
 $messages['savingmessage'] = 'Salvare mesaj...';
 $messages['messagesaved'] = 'Mesajul a fost salvat în Ciorne';
-$messages['successfullysaved'] = 'Salvarea s-a efectuat cu succes';
+$messages['successfullysaved'] = 'Salvat cu succes.';
 $messages['addedsuccessfully'] = 'Contactul a fost adăugat cu succes în agendă';
-$messages['contactexists'] = 'Mai există un contact cu această adresă de e-mail';
+$messages['contactexists'] = 'Un contact cu această adresă de e-mail există deja.';
 $messages['contactnameexists'] = 'Există deja un contact cu acelaşi nume.';
 $messages['blockedimages'] = 'Pentru a vă proteja intimitatea, imaginile externe au fost blocate.';
 $messages['encryptedmessage'] = 'Acesta este un mesaj criptat şi nu poate fi afişat. Ne pare rău.';
 $messages['nocontactsfound'] = 'Nu s-a găsit nici un contact';
 $messages['contactnotfound'] = 'Contactul solicitat nu a fost găsit.';
-$messages['contactsearchonly'] = 'Introdu nişte termeni decăutare pentru a găsi contactele';
+$messages['contactsearchonly'] = 'Introdu nişte termeni de căutare pentru a găsi contactele';
 $messages['sendingfailed'] = 'Nu s-a reuşit trimiterea mesajului';
 $messages['senttooquickly'] = 'Vă rugăm aşteptaţi $sec sec. înainte de a trimite acest mesaj';
-$messages['errorsavingsent'] = 'A intervenit o eroare în timp ce se efectua salvarea mesajului trimis';
-$messages['errorsaving'] = 'A intervenit o eroare în timp ce se efectua salvarea';
-$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['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
+$messages['errormoving'] = 'Nu am putut muta mesajul (mesajele).';
+$messages['errorcopying'] = 'Nu am putut copia mesajul (mesajele).';
+$messages['errordeleting'] = 'Nu am putut şterge mesajul (mesajele).';
+$messages['errormarking'] = 'Nu am putut marca mesajul (mesajele)';
+$messages['deletecontactconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi contactul/ele selectat(e)?';
+$messages['deletegroupconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi grupul selectat?';
+$messages['deletemessagesconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi mesajul (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['contactdeleting'] = 'Şterg contactul(ele)...';
+$messages['contactdeleting'] = 'Şterg contactul (ele)...';
 $messages['groupdeleting'] = 'Şterg grupul...';
 $messages['folderdeleting'] = 'Se şterge dosarul...';
 $messages['foldermoving'] = 'Se mută dosarul...';
@@ -100,14 +96,17 @@ $messages['deletedsuccessfully'] = 'Mesaj şters cu succes !';
 $messages['converting'] = 'Resetez mesajul la parametrii iniţiali...';
 $messages['messageopenerror'] = 'Nu s-a putut încărca mesajul din server';
 $messages['fileuploaderror'] = 'Încărcarea pe server a eşuat';
-$messages['filesizeerror'] = 'Fişierul încărcat depăşeşte mărimea de $size';
-$messages['copysuccess'] = '$nr adrese s-au copiat cu succes';
-$messages['copyerror'] = 'Nu s-a putut copia nicio adresă';
-$messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only"(se poate doar citi)';
+$messages['filesizeerror'] = 'Fişierul încărcat depăşeşte dimensiunea de $size';
+$messages['copysuccess'] = 'Am copiat cu succes $nr contacte.';
+$messages['movesuccess'] = 'Am mutat cu succes $nr contacte.';
+$messages['copyerror'] = 'Nu am putut copia nici un contact.';
+$messages['moveerror'] = 'Nu am putut muta nici un contact.';
+$messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only" (se poate doar citi)';
 $messages['errorsavingcontact'] = 'Nu s-a putut salva adresa de contact';
 $messages['movingmessage'] = 'Mutare mesaj....';
 $messages['copyingmessage'] = 'Copiere mesaj...';
 $messages['copyingcontact'] = 'Copiez contact(ele)...';
+$messages['movingcontact'] = 'Se muta contactul (contactele) ...';
 $messages['deletingmessage'] = 'Şterg mesaj(ele)...';
 $messages['markingmessage'] = 'Marchez mesaj(ele)...';
 $messages['addingmember'] = 'Adaug contact(ele) la grup...';
@@ -118,18 +117,20 @@ $messages['deleteidentityconfirm'] = 'Chiar vrei să ştergi aceasă identitate?
 $messages['nodeletelastidentity'] = 'Nu puteţi şterge această identitate, este ultima.';
 $messages['forbiddencharacter'] = 'Numele dosarului conţine un caracter nepermis.';
 $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru încărcare';
-$messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
+$messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată, aceasta fiind disponibila doar pentru citire.';
 $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['importconfirm'] = '<b>$inserted contacte au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja: $names</b>';
 $messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
-$messages['opnotpermitted'] = 'Operaţia nu este permisă!';
+$messages['importmessagesuccess'] = 'Am importat cu succes $nr mesaje.';
+$messages['importmessageerror'] = 'Importarea a esuat. Fisierul incarca nu este un mesaj valid pentru email.';
+$messages['opnotpermitted'] = 'Operaţiunea nu este permisă!';
 $messages['nofromaddress'] = 'Nu există o adresă de e-mail în identitatea selectată';
 $messages['editorwarning'] = 'Trecerea în mod text a editorului va cauza pierderea formatării textului. Doriţi să continuaţi?';
-$messages['httpreceivedencrypterror'] = 'Vă rugăm să luaţi legătura cu administratorul serverului de mail, deoarece există o eroare în configuraţia acestuia. Mesajul d-voastră nu a fost trimis.';
+$messages['httpreceivedencrypterror'] = 'Vă rugăm să luaţi legătura cu administratorul serverului de mail, deoarece există o eroare în configuraţia acestuia. <b>Mesajul d-voastră nu a fost trimis.</b>';
 $messages['smtpconnerror'] = 'Eroare SMTP ($code): Conexiunea cu serverul a eşuat';
 $messages['smtpautherror'] = 'Eroare SMTP ($code): Autentificare eşuată';
 $messages['smtpfromerror'] = 'Eroare SMTP ($code): Nu s-a putut seta expeditorul "$from" ($msg)';
@@ -139,7 +140,6 @@ $messages['smtperror'] = 'Eroare SMTP: $msg';
 $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
 $messages['toomanyrecipients'] = 'Prea mulţi destinatari. Reduceţi numărul de destinatari la $max.';
 $messages['maxgroupmembersreached'] = 'Numărul de membri ai grupului depăşeşte maximul de $max.';
-$messages['internalerror'] = 'A avut loc o eroare internă. Încearcă mai târziu.';
 $messages['contactdelerror'] = 'Nu am putut şterge contact(ele).';
 $messages['contactdeleted'] = 'Contact(ele) au fost şterse cu succes.';
 $messages['contactrestoreerror'] = 'Nu am putut restaura contact(ele) şterse.';
@@ -148,13 +148,13 @@ $messages['groupdeleted'] = 'Grupul a fost şters cu succes.';
 $messages['grouprenamed'] = 'Grupul a fost redenumit cu succes.';
 $messages['groupcreated'] = 'Grupul a fost creat cu succes.';
 $messages['savedsearchdeleted'] = 'Căutarea salvată a fost ştearsă cu succes.';
-$messages['savedsearchdeleteerror'] = 'Nu a putut şterge căutarea salvată.';
+$messages['savedsearchdeleteerror'] = 'Nu am putut şterge căutarea salvată.';
 $messages['savedsearchcreated'] = 'Căutarea a fost salvată cu succes.';
 $messages['savedsearchcreateerror'] = 'Nu am putut salva căutarea.';
-$messages['messagedeleted'] = 'Mesaj(ele) a(u) fost şters(e) cu succes.';
-$messages['messagemoved'] = 'Mesaj(ele) a(u) fost mutat(e) cu succes.';
-$messages['messagecopied'] = 'Mesaj(ele) a(u) fost copiat(e) cu succes.';
-$messages['messagemarked'] = 'Mesaj(ele) a(u) fost marcat(e) cu succes.';
+$messages['messagedeleted'] = 'Mesajul (ele) a (u) fost şters (e) cu succes.';
+$messages['messagemoved'] = 'Mesajul (ele) a (u) fost mutat (e) cu succes.';
+$messages['messagecopied'] = 'Mesajul (ele) a (u) fost copiat (e) cu succes.';
+$messages['messagemarked'] = 'Mesajul (ele) a (u) fost marcat (e) cu succes.';
 $messages['autocompletechars'] = 'Introdu măcar $min caractere pentru autocompletare.';
 $messages['autocompletemore'] = 'Au fost găsite mai multe înregistrări. Introdu mai multe caractere.';
 $messages['namecannotbeempty'] = '"Nume" nu poate fi gol.';
@@ -166,6 +166,5 @@ $messages['mispellingsfound'] = 'Au fost găsite greşeli de ortografie în mesa
 $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.';
-
+$messages['noscriptwarning'] = 'Atenție: Serviciul de webmail necesită Javascript! Pentru a-l utiliza vă rugăm activați Javascript în setările browserului.';
 ?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 6b2b4ebca..109793666 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Добро пожаловать в $product!';
 $labels['username']  = 'Имя пользователя';
 $labels['password']  = 'Пароль';
 $labels['server']    = 'Сервер';
 $labels['login']     = 'Войти';
-
-// taskbar
 $labels['logout']   = 'Выход';
 $labels['mail']     = 'Почта';
 $labels['settings'] = 'Настройки';
 $labels['addressbook'] = 'Контакты';
-
-// mailbox names
 $labels['inbox']  = 'Входящие';
 $labels['drafts'] = 'Черновики';
 $labels['sent']   = 'Отправленные';
 $labels['trash']  = 'Корзина';
 $labels['junk']   = 'СПАМ';
 $labels['show_real_foldernames'] = 'Показывать настоящие названия специальных папок';
-
-// message listing
 $labels['subject'] = 'Тема';
 $labels['from']    = 'От';
 $labels['sender']  = 'Отправитель';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статус прочтения';
 $labels['listoptions'] = 'Настройки списка...';
-
 $labels['mailboxlist'] = 'Папки';
 $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']   = 'Переместить в...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Загрузить';
 $labels['open']     = 'Открыть';
 $labels['showattachment'] = 'Показать';
 $labels['showanyway'] = 'Все равно показать';
-
 $labels['filename'] = 'Имя файла';
 $labels['filesize'] = 'Размер файла';
-
 $labels['addtoaddressbook'] = 'Добавить в контакты';
-
-// weekdays short
 $labels['sun'] = 'Вс';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-
-// weekdays long
 $labels['sunday']    = 'Воскресенье';
 $labels['monday']    = 'Понедельник';
 $labels['tuesday']   = 'Вторник';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Среда';
 $labels['thursday']  = 'Четверг';
 $labels['friday']    = 'Пятница';
 $labels['saturday']  = 'Суббота';
-
-// months short
 $labels['jan']	= 'Янв';
 $labels['feb']	= 'Фев';
 $labels['mar']	= 'Мар';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Сен';
 $labels['oct']	= 'Окт';
 $labels['nov']	= 'Ноя';
 $labels['dec']	= 'Дек';
-
-// months long
 $labels['longjan']	= 'Январь';
 $labels['longfeb']	= 'Февраль';
 $labels['longmar']	= 'Март';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Сентябрь';
 $labels['longoct']	= 'Октябрь';
 $labels['longnov']	= 'Ноябрь';
 $labels['longdec']	= 'Декабрь';
-
 $labels['today'] = 'Сегодня';
-
-// toolbar buttons
 $labels['refresh']          = 'Обновить';
 $labels['checkmail']        = 'Доставить почту';
 $labels['compose']          = 'Написать сообщение';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Дополнительные действия...'
 $labels['more']             = 'Еще';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметры';
-
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Отсутствует';
@@ -174,7 +148,6 @@ $labels['expand-all'] = 'Развернуть все';
 $labels['expand-unread'] = 'Развернуть непрочитанные';
 $labels['collapse-all'] = 'Свернуть все';
 $labels['threaded'] = 'Обсуждения';
-
 $labels['autoexpand_threads'] = 'Развернуть обсуждения';
 $labels['do_expand'] = 'все обсуждения';
 $labels['expand_only_unread'] = 'только с непрочитанными сообщениями';
@@ -190,16 +163,13 @@ $labels['listcolumns'] = 'Колонки';
 $labels['listsorting'] = 'Сортировать по';
 $labels['listorder'] = 'Порядок сортировки';
 $labels['listmode'] = 'Режим просмотра';
-
 $labels['folderactions'] = 'Операции над папкой...';
 $labels['compact'] = 'Сжать';
 $labels['empty'] = 'Опустошить';
 $labels['importmessages'] = 'Импорт сообщений';
-
 $labels['quota'] = 'Квота';
 $labels['unknown']  = 'неизвестно';
 $labels['unlimited']  = 'без ограничений';
-
 $labels['quicksearch']  = 'Быстрый поиск';
 $labels['resetsearch']  = 'Сброс';
 $labels['searchmod']  = 'Варианты поиска';
@@ -207,13 +177,10 @@ $labels['msgtext']  = 'Всё сообщение';
 $labels['body']  = 'Тело письма';
 $labels['type'] = 'Тип';
 $labels['namex'] = 'Имя';
-
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
 $labels['changeformattext'] = 'Показать в формате обычного текста';
 $labels['changeformathtml'] = 'Показать в HTML формате';
-
-// message compose
 $labels['editasnew']      = 'Редактировать как новое';
 $labels['send']           = 'Отправить';
 $labels['sendmessage']    = 'Отправить сейчас';
@@ -225,26 +192,22 @@ $labels['returnreceipt']  = 'Запрос ответа';
 $labels['dsn']            = 'Уведомление о состоянии доставки';
 $labels['mailreplyintro'] = '$sender писал $date:';
 $labels['originalmessage'] = 'Исходное сообщение';
-
 $labels['editidents']    = 'Изменить данные';
 $labels['spellcheck']    = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
 $labels['resumeediting'] = 'Продолжить редактирование';
 $labels['revertto']      = 'Отменить правки';
-
 $labels['attach'] = 'Вложить';
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
 $labels['uploadprogress'] = '$percent ($current из $total)';
 $labels['close']  = 'Закрыть';
 $labels['messageoptions']  = 'Настройки сообщений...';
-
 $labels['low']     = 'Низкий';
 $labels['lowest']  = 'Низший';
 $labels['normal']  = 'Норм.';
 $labels['high']    = 'Высокий';
 $labels['highest'] = 'Высоч.';
-
 $labels['nosubject']  = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
@@ -252,25 +215,19 @@ $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'] = 'Это уведомление означает только, что сообщение было открыто получателем, и не гарантирует того, что оно было прочитано и (или) понято.';
-
-// address boook
 $labels['name']         = 'Отображаемое имя';
 $labels['firstname']    = 'Имя';
 $labels['surname']      = 'Фамилия';
@@ -305,7 +262,6 @@ $labels['search'] = 'Поиск';
 $labels['advsearch'] = 'Расширенный поиск';
 $labels['advanced'] = 'Дополнительно';
 $labels['other'] = 'Другое';
-
 $labels['typehome']   = 'Дом';
 $labels['typework']   = 'Работа';
 $labels['typeother']  = 'Другое';
@@ -320,14 +276,12 @@ $labels['typeassistant']  = 'Помощник';
 $labels['typehomepage']  = 'Домашняя страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профиль';
-
 $labels['addfield'] = 'Добавить поле...';
 $labels['addcontact'] = 'Добавить  новый контакт';
 $labels['editcontact'] = 'Редактировать контакт';
 $labels['contacts'] = 'Контакты';
 $labels['contactproperties'] = 'Свойства контакта';
 $labels['personalinfo'] = 'Личная информация';
-
 $labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save']   = 'Сохранить';
@@ -336,7 +290,6 @@ $labels['rename'] = 'Переименовать';
 $labels['addphoto'] = 'Добавить';
 $labels['replacephoto'] = 'Заменить';
 $labels['uploadphoto'] = 'Загрузить фотографию';
-
 $labels['newcontact']     = 'Создать новый контакт';
 $labels['deletecontact']  = 'Удалить выбранные контакты';
 $labels['composeto']      = 'Создать сообщение для выбранных контактов';
@@ -350,42 +303,36 @@ $labels['newcontactgroup'] = 'Создать группу контактов';
 $labels['grouprename']    = 'Переименовать группу';
 $labels['groupdelete']    = 'Удалить группу';
 $labels['groupremoveselected'] = 'Удалить выбранные контакты из группы';
-
 $labels['previouspage']   = 'Показать предыдущую страницу';
 $labels['firstpage']      = 'Показать первую страницу';
 $labels['nextpage']       = 'Показать следующую страницу';
 $labels['lastpage']       = 'Показать последнюю страницу';
-
 $labels['group'] = 'Группа';
 $labels['groups'] = 'Группы';
 $labels['listgroup'] = 'Список членов группы';
 $labels['personaladrbook'] = 'Персональные адреса';
-
 $labels['searchsave'] = 'Сохранить запрос';
 $labels['searchdelete'] = 'Удалить запрос';
-
 $labels['import'] = 'Импортировать';
 $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
-$labels['importtarget'] = 'Добавить новые контакты в адресную книгу:';
+$labels['importtarget'] = 'Добавить контакты в';
 $labels['importreplace'] = 'Заменить всю адресную книгу';
+$labels['importgroups'] = 'Распределение по группам при импорте.';
+$labels['importgroupsall'] = 'Все (создать группы при необходимости)';
+$labels['importgroupsexisting'] = 'Только для существующих групп';
 $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';
@@ -481,7 +428,6 @@ $labels['standardwindows'] = 'Обрабатывать всплывающие о
 $labels['forwardmode'] = 'Пересылка сообщений';
 $labels['inline'] = 'в тексте';
 $labels['asattachment'] = 'как вложение';
-
 $labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Имя папки';
@@ -502,26 +448,20 @@ $labels['foldertype'] = 'Тип каталога';
 $labels['personalfolder']  = 'Приватный каталог';
 $labels['otherfolder']  = 'Каталог другого пользователя';
 $labels['sharedfolder']  = 'Совместный каталог';
-
 $labels['sortby'] = 'Сортировать по';
 $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'] = 'Западноевропейский';
@@ -540,5 +480,4 @@ $labels['vietnamese'] = 'Вьетнамский';
 $labels['japanese'] = 'Японский';
 $labels['korean'] = 'Корейский';
 $labels['chinese'] = 'Китайский';
-
 ?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index e7dd36298..d8da5ee5c 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Произошла ошибка!';
 $messages['loginfailed']  = 'Неудачная попытка входа.';
 $messages['cookiesdisabled'] = 'Ваш браузер не принимает cookie.';
@@ -172,5 +170,4 @@ $messages['parentnotwritable'] = 'Не удается создать/перем�
 $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 92d33d3b7..9baa37028 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -15,66 +15,40 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '$product වෙත පිළිගනිමු';
 $labels['username']  = 'පරිශීලක නාමය';
 $labels['password']  = 'මුරපදය';
 $labels['server']    = 'පද්ධතිය';
 $labels['login']     = 'පිවිසුම';
-
-// taskbar
 $labels['logout']   = 'පිටවීම';
 $labels['mail']     = 'විද්‍යුත් තැපැල';
 $labels['settings'] = 'සැකසුම්';
 $labels['addressbook'] = 'ලිපින පොත';
-
-// mailbox names
 $labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'කටු සටහන්';
 $labels['sent']   = 'යැවූ';
 $labels['trash']  = 'ඉවතලන බඳුන';
 $labels['junk']   = 'සුන්බුන්';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'මාතෘකාව';
 $labels['from']    = 'වෙතින්';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'වෙත';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'පිළිතුරු සඳහා';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'දිනය';
 $labels['size']    = 'ප්‍රමාණය';
 $labels['priority'] = 'ප්‍රමුඛත්වය';
 $labels['organization'] = 'සංවිධානය';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'බහාලුම්';
 $labels['messagesfromto'] = '$from වෙතින් $to වෙත පණිවිඩ $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'පණිවිඩ $count න් $nr';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'පිටපත් කරන්න';
 $labels['move']     = 'ගෙනයන්න';
 $labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ගොනුවේ නම';
 $labels['filesize'] = 'ගොනුවේ ප්‍රමාණය';
-
 $labels['addtoaddressbook'] = 'ලිපින පොතට එක් කරන්න';
-
-// weekdays short
 $labels['sun'] = 'ඉ';
 $labels['mon'] = 'ස';
 $labels['tue'] = 'අ';
@@ -82,8 +56,6 @@ $labels['wed'] = 'බ';
 $labels['thu'] = 'බ්‍ර';
 $labels['fri'] = 'සි';
 $labels['sat'] = 'සෙ';
-
-// weekdays long
 $labels['sunday']    = 'ඉරිදා';
 $labels['monday']    = 'සඳුදා';
 $labels['tuesday']   = 'අඟහරුවාදා';
@@ -91,8 +63,6 @@ $labels['wednesday'] = 'බදාදා';
 $labels['thursday']  = 'බ්‍රහස්පතින්දා';
 $labels['friday']    = 'සිකුරාදා';
 $labels['saturday']  = 'සෙනසුරාදා';
-
-// months short
 $labels['jan']	= 'ජන';
 $labels['feb']	= 'පෙබ';
 $labels['mar']	= 'මාර්';
@@ -105,8 +75,6 @@ $labels['sep']	= 'සැප්';
 $labels['oct']	= 'ඔක්';
 $labels['nov']	= 'නොවැ';
 $labels['dec']	= 'දෙසැ';
-
-// months long
 $labels['longjan']	= 'ජනවාරි';
 $labels['longfeb']	= 'පෙබරවාරි';
 $labels['longmar']	= 'මාර්තු';
@@ -119,22 +87,14 @@ $labels['longsep']	= 'සැප්තැම්බර්';
 $labels['longoct']	= 'ඔක්තෝම්බර්';
 $labels['longnov']	= 'නොවැම්බර්';
 $labels['longdec']	= 'දෙසැම්බර්';
-
 $labels['today'] = 'අද';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
 $labels['compose']          = 'පණිවිඩයක් සෑදීම';
 $labels['writenewmessage']  = 'අඵත් පණිවිඩයක්';
 $labels['reply']            = 'පිළිතුරු දෙන්න';
 $labels['replytomessage']   = 'පණිවිඩයට පිළිතුරු';
 $labels['replytoallmessage'] = 'එවන්නාට සහ සැමට පිළිතුරු';
-$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'] = 'පණිවිඩය ලටපට වෙත ගෙන යන්න';
@@ -149,144 +109,76 @@ $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['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
-$labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'නොදනී';
 $labels['unlimited']  = 'අසීමිත';
-
 $labels['quicksearch']  = 'ඉක්මන් සෙවුම';
 $labels['resetsearch']  = 'සෙවුම යලි පිහිටවීම';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'සම්පූර්ණ පණිවිඩය';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'අමුණන්න';
 $labels['attachments'] = 'ඇමුණුම්';
 $labels['upload'] = 'ඇතුල් කරීම';
-$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['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'] = 'සටහන: ලැබීම් ලදුපත මගින් මෙම පණිවුඩය කියවූ බව හෝ තේරුම් ගත් බව ගම්‍ය නොවේ. පණිවුඩය ලබන්නාට පෙන්නුම් කල බවටට සාක්ෂියක් පමණි';
-
-// 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']     = 'උපන්දිනය';
@@ -298,189 +190,87 @@ $labels['male']   = 'පුරුෂ';
 $labels['female'] = 'ස්ත්‍රී';
 $labels['manager'] = 'කළමණාකරු';
 $labels['assistant'] = 'සහායක';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'සොයන්න';
-$labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'සංකීර්ණ‍';
 $labels['other'] = 'වෙනත්';
-
 $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['cancel'] = 'අවලංගු කරන්න';
 $labels['save']   = 'සුරකින්න';
 $labels['delete'] = 'මකන්න';
 $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['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['listgroup'] = 'List group members';
 $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['pagesize']  = 'Rows per page';
 $labels['signature'] = 'අත්සන';
 $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['showemail'] = 'Show email address with display name';
 $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['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['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
-$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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'බහාලුම';
 $labels['folders']  = 'බහාලුම්';
 $labels['foldername']  = 'බහාලුමේ නම';
@@ -492,42 +282,27 @@ $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['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'පොදු බහාලුම';
-
 $labels['sortby'] = 'වර්ග කරන්න';
 $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'] = 'හීබෲ';
@@ -539,5 +314,4 @@ $labels['vietnamese'] = 'වියට්නාම';
 $labels['japanese'] = 'ජපන්';
 $labels['korean'] = 'කොරියානු';
 $labels['chinese'] = 'චීන';
-
 ?>
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index dd020b928..0c6fa1156 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -15,30 +15,15 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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'] = 'පණිවිඩය යවමින්...';
@@ -48,129 +33,56 @@ $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['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'තෝරා ඇති පණිවිඩ(ය) ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
 $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['nopagesizewarning'] = 'කරුණාකර පිටුවේ ප්‍රමාණය ඇතුලත් කරන්න.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'කරුණාකර යටත් පිරිසෙයින් එක් ලබන්නෙකු හෝ ඇතුලත් කරන්න';
 $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'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'මෙම ලිපින මූලාශ්රය කියවීම සඳහා පමනි';
 $messages['errorsavingcontact'] = 'ලිපිනය තැන්පත් කීරීමට නොහැක';
 $messages['movingmessage'] = 'පණිවිඩ(ය) ගෙනයමින්...';
 $messages['copyingmessage'] = 'පණිවිඩ(ය) පිටපත් කරමින්...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 465252409..36d9850a0 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -15,34 +15,24 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Vitajte v $product';
-$labels['username']  = 'Prihlasovacie meno';
+$labels['username']  = 'Meno používateľa';
 $labels['password']  = 'Heslo';
 $labels['server']    = 'Server';
 $labels['login']     = 'Prihlásiť';
-
-// taskbar
 $labels['logout']   = 'Odhlásiť';
-$labels['mail']     = 'E-Mail';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Nastavenia';
-$labels['addressbook'] = 'Kontakty';
-
-// mailbox names
+$labels['addressbook'] = 'Adresár kontaktov';
 $labels['inbox']  = 'Doručená pošta';
-$labels['drafts'] = 'Rozpísané';
+$labels['drafts'] = 'Koncepty';
 $labels['sent']   = 'Odoslané';
 $labels['trash']  = 'Kôš';
 $labels['junk']   = 'Nevyžiadaná pošta';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
+$labels['show_real_foldernames'] = 'Pri osobitných priečinkoch zobrazovať reálne názvy';
 $labels['subject'] = 'Predmet';
 $labels['from']    = 'Odosielateľ';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Odosielateľ';
 $labels['to']      = 'Adresát';
 $labels['cc']      = 'Kópia';
 $labels['bcc']     = 'Tajná kópia';
@@ -54,27 +44,21 @@ $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizácia';
 $labels['readstatus'] = 'Čítať stav';
 $labels['listoptions'] = 'Nastavenia zoznamu...';
-
 $labels['mailboxlist'] = '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['download'] = 'stiahnuť';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
+$labels['open']     = 'Otvoriť';
+$labels['showattachment'] = 'Zobraziť';
+$labels['showanyway'] = 'Zobraziť aj napriek tomu';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Št';
 $labels['fri'] = 'Pi';
 $labels['sat'] = 'So';
-
-// weekdays long
 $labels['sunday']    = 'Nedeľa';
 $labels['monday']    = 'Pondelok';
 $labels['tuesday']   = 'Utorok';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Streda';
 $labels['thursday']  = 'Štvrtok';
 $labels['friday']    = 'Piatok';
 $labels['saturday']  = 'Sobota';
-
-// months short
 $labels['jan']	= 'Jan';
 $labels['feb']	= 'Feb';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $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';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'September';
 $labels['longoct']	= 'Október';
 $labels['longnov']	= 'November';
 $labels['longdec']	= 'December';
-
 $labels['today'] = 'Dnes';
-
-// toolbar buttons
 $labels['refresh']          = 'Obnoviť';
 $labels['checkmail']        = 'Skontrolovať nové správy';
 $labels['compose']          = 'Vytvoriť správu';
@@ -155,7 +130,6 @@ $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č';
@@ -163,7 +137,7 @@ $labels['currpage'] = 'Aktuálna stránka';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'S prílohou';
 $labels['deleted'] = 'Zmazané';
 $labels['undeleted'] = 'Nevymazané';
 $labels['invert'] = 'Prevrátiť';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Import messages';
-
+$labels['importmessages'] = 'Importovať správy';
 $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['body']  = 'Body';
-$labels['type'] = 'Type';
-
+$labels['body']  = 'Telo';
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Meno';
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
+$labels['changeformattext'] = 'Zobraziť vo formáte čistého textu';
+$labels['changeformathtml'] = 'Zobraziť vo formáte HTML';
 $labels['editasnew']      = 'Upraviť ako novú';
 $labels['send']           = 'Odoslať';
 $labels['sendmessage']    = 'Odoslať správu';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Skontrolovať pravopis';
 $labels['resumeediting'] = 'Pokračovať v úpravách';
 $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['highest'] = 'Najvyššia';
-
 $labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Ukázať obrázky';
 $labels['alwaysshow'] = 'Vždy zobraziť obrázky od $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Názov';
 $labels['firstname']    = 'Meno';
 $labels['surname']      = 'Priezvisko';
@@ -304,7 +262,6 @@ $labels['search'] = 'Hľadať';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
 $labels['advanced'] = 'Rozšírené';
 $labels['other'] = 'Ostatné';
-
 $labels['typehome']   = 'Domov';
 $labels['typework']   = 'Práca';
 $labels['typeother']  = 'Ostatné';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Zrušiť';
 $labels['save']   = 'Uložiť';
@@ -335,61 +290,54 @@ $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['contactsfromto'] = 'Kontakty od $from do $to z $count';
 $labels['print']          = 'Tlač';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exportovať všetko';
+$labels['exportsel']      = 'Exportovať vybrané';
 $labels['exportvcards']   = 'Exportovať kontakty vo formáte vCard';
 $labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
 $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['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Zoznam členov 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['importtarget'] = 'Pridať kontakty do';
 $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['importgroups'] = 'Importovať priradenia do skupín';
+$labels['importgroupsall'] = 'Všetky (vytvoriť skupiny, ak je to potrebné)';
+$labels['importgroupsexisting'] = 'Len pre existujúce skupiny';
+$labels['importdesc'] = 'Môžete vložiť kontakty zo svojho existujúceho adresára.<br/>Momentálne je možné importovanie adries z formátu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> alebo CSV (údaje oddeľované čiarkou).';
 $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['messagepart'] = 'Časť';
+$labels['digitalsig'] = 'Digitálny podpis';
 $labels['dateformat'] = 'Formát dátumu';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Krajší dátum';
@@ -406,7 +354,7 @@ $labels['htmleditor'] = 'Vytvoriť HTML správu';
 $labels['htmlonreply'] = 'len v odpovedi na HTML správy';
 $labels['htmlonreplyandforward'] = 'pri preposielaní alebo odpovedi na HTML správu';
 $labels['htmlsignature'] = 'HTML podpis';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Zobrazovať e-mailovú adresu so zobrazeným menom';
 $labels['previewpane'] = 'Ukázať náhľad';
 $labels['skin'] = 'Vzhľad';
 $labels['logoutclear'] = 'Vyprázdniť kôš pri odhlásení';
@@ -431,7 +379,7 @@ $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['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Obnoviť (skontrolovať nové správy a podobne)';
 $labels['never']  = 'nikdy';
 $labels['immediately']  = 'ihneď';
 $labels['messagesdisplaying'] = 'Zobrazovanie správ';
@@ -466,7 +414,7 @@ $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['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Predvolený adresár';
 $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';
@@ -476,11 +424,10 @@ $labels['spellcheckignorenums'] = 'Ignorovať slová s číslami';
 $labels['spellcheckignorecaps'] = 'Ignorovať slová písané veľkými písmenami';
 $labels['addtodict'] = 'Pridať do slovníka';
 $labels['mailtoprotohandler'] = 'Zaregistrovať handler pre odkazy „mailto:“';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'S vyskakovacími oknami pracovať ako so štandardnými oknami';
 $labels['forwardmode'] = 'Preposielanie správ';
 $labels['inline'] = 'v tele spávy';
 $labels['asattachment'] = 'ako príloha';
-
 $labels['folder']  = 'Priečinok';
 $labels['folders']  = 'Priečinky';
 $labels['foldername']  = 'Názov priečinku';
@@ -501,26 +448,20 @@ $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['sortby'] = 'Triediť podľa';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamčina';
 $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 17aaa3a53..db830c2a7 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Váš internetový prehliadač nepodporuje cookies, ktoré sú potrebné pre prihlásenie';
@@ -28,14 +26,14 @@ $messages['dberror'] = 'Databázová chyba!';
 $messages['requesttimedout'] = 'Čas požiadavky vypršal';
 $messages['errorreadonly'] = 'Nemožno vykonať operáciu. Adresár je len na čítanie';
 $messages['errornoperm'] = 'Nemožno vykonať operáciu. Prístup odmietnutý';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['erroroverquota'] = 'Nemožno vykonať operáciu. Na disku nie je dostatok voľného miesta.';
+$messages['erroroverquotadelete'] = 'Na disku nie je dostatok voľného miesta. Vymažte nejakú správu pomocou klávesov SHIFT+DEL.';
 $messages['invalidrequest'] = 'Chybný požiadavek. Žiadne údaje neboli uložené.';
 $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['refreshing'] = 'Obnovuje sa...';
 $messages['loading'] = 'Načítava sa...';
 $messages['uploading'] = 'Nahrávám súbor...';
 $messages['uploadingmany'] = 'Nahrávam súbory...';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Požadovaný kontakt nebol nájdený';
 $messages['contactsearchonly'] = 'Zadaj nejaký vyhľadávací výraz pre hľadanie kontaktov.';
 $messages['sendingfailed'] = 'Odosielanie správy zlyhalo';
 $messages['senttooquickly'] = 'Počkajte $sec sekúnd pred odoslaním tejto správy';
-$messages['errorsavingsent'] = 'Pri ukladaní odoslanej správy nastala chyba';
-$messages['errorsaving'] = 'Vyskytla sa chyba pri ukladaní';
 $messages['errormoving'] = 'Správa sa nedá presunúť';
 $messages['errorcopying'] = 'Správa sa nedá skopírovať';
 $messages['errordeleting'] = 'Správa sa nedá zmazať';
@@ -101,16 +97,16 @@ $messages['converting'] = 'Odstraňuje sa formátovanie správy...';
 $messages['messageopenerror'] = 'Nedá sa načítať správa zo servera';
 $messages['fileuploaderror'] = 'Načítanie súboru nebolo úspešné';
 $messages['filesizeerror'] = 'Načítavaný súbor prekročil maximálnu veľkosť $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = 'Počet úspešne skopírovaných kontaktov: $nr.';
+$messages['movesuccess'] = 'Počet úspešne presunutých kontaktov: $nr.';
+$messages['copyerror'] = 'Kontakty nie je možné kopírovať.';
+$messages['moveerror'] = 'Kontakty nemožno presúvať.';
 $messages['sourceisreadonly'] = 'Tento zdroj adries je len na čítanie';
 $messages['errorsavingcontact'] = 'Nedá sa uložiť adresa kontaktu';
 $messages['movingmessage'] = 'Správa sa presúva...';
 $messages['copyingmessage'] = 'Správa sa kopíruje...';
 $messages['copyingcontact'] = 'Kopírujem kontakt(y)';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = 'Presúvanie kontaktu (kontaktov)...';
 $messages['deletingmessage'] = 'Mažem správu(y)...';
 $messages['markingmessage'] = 'Označujem správu(y)...';
 $messages['addingmember'] = 'Pridávam kontakt(y) do skupiny...';
@@ -126,11 +122,11 @@ $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['importformaterror'] = 'Import nebol úspešný! Odoslaný súbor nie je platným súborom, z ktorého je možné vykonať import údajov.';
 $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = 'Počet úspešne naimportovaných správ: $nr';
+$messages['importmessageerror'] = 'Importovanie bolo neúspešné! Odoslaný súbor nie je platným súborom pre správu alebo poštový priečinok';
 $messages['opnotpermitted'] = 'Operácia nie je povolená!';
 $messages['nofromaddress'] = 'Zvolená identita neobsahuje e-mailovú adresu';
 $messages['editorwarning'] = 'Prepnutie na editor obyčajného textu spôsobí stratu formátovania. Chcete napriek tomu pokračovať?';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Príliš veľa príjemcov. Zmenšite počet príjemcov na $max.';
 $messages['maxgroupmembersreached'] = 'Počet členov skupiny dosiahol maxima z $max';
-$messages['internalerror'] = 'Došlo k internej chybe. Skúste to znova';
 $messages['contactdelerror'] = 'Nemôžem vymazať kontakt(y)';
 $messages['contactdeleted'] = 'Kontakt(y) bol vymazaný';
 $messages['contactrestoreerror'] = 'Nemôžem obnoviť zmazané kontakty';
@@ -170,7 +165,6 @@ $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.';
-
+$messages['attachmentvalidationerror'] = 'UPOZORNENIE! Táto príloha je podozrivá, pretože jej typ sa nezhoduje s typom uvedeným v správe. Ak odosielateľovi prílohy nedôverujete, nemali by ste prílohu otvárať. Môže totiž obsahovať škodlivý obsah.<br/><br/><em>Očakávaná hodnota: $expected; nájdená hodnota: $detected</em>';
+$messages['noscriptwarning'] = 'Upozornenie: Táto webmailová služba vyžaduje Javascript! Ak ju chcete používať, prosím aktivujte Javascript v nastaveniach svojho prehliadača.';
 ?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index c33ea479c..f93684d69 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Prejeto';
 $labels['drafts'] = 'Osnutki';
 $labels['sent']   = 'Poslano';
 $labels['trash']  = 'Smeti';
 $labels['junk']   = 'Nezaželena sporočila';
 $labels['show_real_foldernames'] = 'Prikaži prava imena za posebne mape';
-
-// message listing
 $labels['subject'] = 'Zadeva';
 $labels['from']    = 'Pošiljatelj';
 $labels['sender']  = 'Pošiljatelj';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioriteta';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status';
 $labels['listoptions'] = 'Možnosti prikaza...';
-
 $labels['mailboxlist'] = '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...';
@@ -68,13 +56,9 @@ $labels['download'] = 'Prenesi';
 $labels['open']     = 'Odpri';
 $labels['showattachment'] = 'Prikaži';
 $labels['showanyway'] = 'Prikaži';
-
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
-
 $labels['addtoaddressbook'] = 'Dodaj med stike';
-
-// weekdays short
 $labels['sun'] = 'ned';
 $labels['mon'] = 'pon';
 $labels['tue'] = 'tor';
@@ -82,8 +66,6 @@ $labels['wed'] = 'sre';
 $labels['thu'] = 'čet';
 $labels['fri'] = 'pet';
 $labels['sat'] = 'sob';
-
-// weekdays long
 $labels['sunday']    = 'nedelja';
 $labels['monday']    = 'ponedeljek';
 $labels['tuesday']   = 'torek';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'sreda';
 $labels['thursday']  = 'četrtek';
 $labels['friday']    = 'petek';
 $labels['saturday']  = 'sobota';
-
-// months short
 $labels['jan']	= 'jan';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'sep';
 $labels['oct']	= 'okt';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'dec';
-
-// months long
 $labels['longjan']	= 'januar';
 $labels['longfeb']	= 'februar';
 $labels['longmar']	= 'marec';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'september';
 $labels['longoct']	= 'oktober';
 $labels['longnov']	= 'november';
 $labels['longdec']	= 'december';
-
 $labels['today'] = 'Danes';
-
-// toolbar buttons
 $labels['refresh']          = 'Osveži';
 $labels['checkmail']        = 'Preglej nova sporočila';
 $labels['compose']          = 'Sestavi sporočilo';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Več možnosti...';
 $labels['more']             = 'Več';
 $labels['back']             = 'Nazaj';
 $labels['options']          = 'Možnosti';
-
 $labels['select'] = 'Izberi';
 $labels['all'] = 'Vse';
 $labels['none'] = 'Brez';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Uvozi sporočila';
-
 $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['body']  = 'Vsebina sporočila';
 $labels['type'] = 'Tip';
-
+$labels['namex'] = 'Ime';
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
 $labels['changeformattext'] = 'Prikaži kot golo besedilo';
 $labels['changeformathtml'] = 'Prikaži v formatu HTML';
-
-// message compose
 $labels['editasnew']      = 'Uredi kot novo';
 $labels['send']           = 'Pošlji';
 $labels['sendmessage']    = 'Pošlji sporočilo';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Preglej pravopis';
 $labels['resumeediting'] = 'Nadaljuj z urejanjem';
 $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['highest'] = 'Najvišja';
-
 $labels['nosubject']  = '(brez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Vedno prikaži slike od $sender';
@@ -251,25 +215,19 @@ $labels['isdraft']    = 'To je osnutek sporočila.';
 $labels['andnmore']   = '$nr več...';
 $labels['togglemoreheaders'] = 'Prikaži več glav sporočila';
 $labels['togglefullheaders'] = 'Preklopi na neobdelan zapis glave sporočila';
-
 $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.';
-
-// address boook
 $labels['name']         = 'Ime za prikaz';
 $labels['firstname']    = 'Ime';
 $labels['surname']      = 'Priimek';
@@ -304,7 +262,6 @@ $labels['search'] = 'Iskanje';
 $labels['advsearch'] = 'Napredno iskanje';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-
 $labels['typehome']   = 'Doma';
 $labels['typework']   = 'Služba';
 $labels['typeother']  = 'Ostalo';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Prekliči';
 $labels['save']   = 'Shrani';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,32 @@ $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
 $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['group'] = 'Skupina';
 $labels['groups'] = 'Skupine';
 $labels['listgroup'] = 'Izpiši seznam članov 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'] = 'Stike lahko naložite iz obstoječega imenika. <br/>Trenutno je podprt uvoz stikov v zapisu  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico ločene vrednosti) zapisu.';
 $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';
@@ -480,7 +424,6 @@ $labels['standardwindows'] = 'Prikaži pojavna okna kot običajna';
 $labels['forwardmode'] = 'Posredovanje sporočil';
 $labels['inline'] = 'medvrstično';
 $labels['asattachment'] = 'Kot priponka';
-
 $labels['folder']  = 'Mapa';
 $labels['folders']  = 'Mape';
 $labels['foldername']  = 'Ime mape';
@@ -501,26 +444,20 @@ $labels['foldertype'] = 'Tip mape';
 $labels['personalfolder']  = 'Zasebna mapa';
 $labels['otherfolder']  = 'Mapa drugega uporabnika';
 $labels['sharedfolder']  = 'Javna mapa';
-
 $labels['sortby'] = 'Uredi po';
 $labels['sortasc']  = 'Uredi naraščajoče';
 $labels['sortdesc'] = 'Uredi padajoče';
 $labels['undo'] = 'Prekliči';
-
 $labels['installedplugins'] = 'Nameščeni vtičniki';
 $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';
@@ -539,5 +476,4 @@ $labels['vietnamese'] = 'Vietnamsko';
 $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 dc731d01b..f1beffc0f 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Vaš spletni brskalnik ne sprejema piškotkov.';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Iskanega stika ni bilo mogoče najti.';
 $messages['contactsearchonly'] = 'Vpišite iskalni parameter za iskanje stika';
 $messages['sendingfailed'] = 'Sporočila ni bilo mogoče poslati.';
 $messages['senttooquickly'] = 'Počakajte $sec sekund in nato znova poskusite s pošiljanjem sporočila.';
-$messages['errorsavingsent'] = 'Pri shranjevanju poslanega sporočila je prišlo do napake.';
-$messages['errorsaving'] = 'Pri shranjevanju je prišlo do napake.';
 $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.';
@@ -101,13 +97,16 @@ $messages['converting'] = 'Odstranjevanje nastavitev oblikovanja...';
 $messages['messageopenerror'] = 'Sporočila ni bilo mogoče prenesti iz strežnika';
 $messages['fileuploaderror'] = 'Prenos datoteke je spodletel';
 $messages['filesizeerror'] = 'Naložena datoteka presega največjo dovoljeno velikost $size';
-$messages['copysuccess'] = '$nr naslovov je bilo uspešno prenešenih';
-$messages['copyerror'] = 'Nobenih naslovov ni bilo mogoče kopirati';
+$messages['copysuccess'] = 'Uspešno ste kopirali $nr stikov.';
+$messages['movesuccess'] = 'Uspešno ste premaknili $nr stikov.';
+$messages['copyerror'] = 'Stikov ni bilo mogoče kopirati.';
+$messages['moveerror'] = 'Stikov ni bilo mogoče premakniti.';
 $messages['sourceisreadonly'] = 'Ta naslov je na voljo samo za branje';
 $messages['errorsavingcontact'] = 'Stika ni bilo mogoče shraniti';
 $messages['movingmessage'] = 'Premikanje sporočila...';
 $messages['copyingmessage'] = 'Kopiranje sporočila...';
 $messages['copyingcontact'] = 'Kopiranje stika/ov';
+$messages['movingcontact'] = 'Premikanje stika(ov)...';
 $messages['deletingmessage'] = 'Brisanje sporočil/a';
 $messages['markingmessage'] = 'Označevanje sporočil/a';
 $messages['addingmember'] = 'Dodajanje stika/ov v skupino...';
@@ -141,7 +140,6 @@ $messages['smtperror'] = 'Napaka pri pošiljanju:$msg';
 $messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email';
 $messages['toomanyrecipients'] = 'Navedli ste preveč prejemnikov. Zmanjšajte število prejemnikov na $max';
 $messages['maxgroupmembersreached'] = 'Število članov skupine presega največje dovoljeno število $max.';
-$messages['internalerror'] = 'Prišlo je do napake. Poskusite znova.';
 $messages['contactdelerror'] = 'Stika/ov ni bilo mogoče izbrisati';
 $messages['contactdeleted'] = 'Stik/i so bili uspešno izbrisani';
 $messages['contactrestoreerror'] = 'Ni bilo mogoče obnoviti izbrisanih stikov.';
@@ -169,5 +167,4 @@ $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogoče ustvariti/p
 $messages['messagetoobig'] = 'Sporočilo je preveliko za obdelavo.';
 $messages['attachmentvalidationerror'] = 'OPOZORILO! Priponka vsebuje sumljivo vsebino, saj tip priponke ne ustreza tipu, določenemu v sporočilu. Če ne zaupate pošiljatelju, priponke v brskalniku ne odpirajte, saj lahko vsebuje zlonamerno vsebino. <br/><br/><em>Pričakovano: $expected; Najdeno: $detected</em>';
 $messages['noscriptwarning'] = 'Opozorilo: Ta spletna stran zahteva Javascript! Za uporabo 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 e2cb6791b..fa822a728 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Ardhjet';
 $labels['drafts'] = 'Drafte';
 $labels['sent']   = 'Dërguar';
 $labels['trash']  = 'Fshirë';
 $labels['junk']   = 'Reklama';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Tema';
 $labels['from']    = 'Dërguesi';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Marrësi';
 $labels['cc']      = 'Kopje';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
-$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['messagesfromto'] = 'Mesazhet $from në $to nga $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mesazhi $nr nga $count';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'Kopje';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
-$labels['open']     = 'Open';
-$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';
@@ -82,8 +55,6 @@ $labels['wed'] = 'Mër';
 $labels['thu'] = 'Enj';
 $labels['fri'] = 'Pre';
 $labels['sat'] = 'Sht';
-
-// weekdays long
 $labels['sunday']    = 'e djelë';
 $labels['monday']    = 'e hënë';
 $labels['tuesday']   = 'e martë';
@@ -91,50 +62,12 @@ $labels['wednesday'] = 'e mërkurë';
 $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';
-
-// 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['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';
@@ -145,342 +78,94 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$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['importmessages'] = 'Import messages';
-
 $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['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'Bashkangjitjet';
 $labels['upload'] = 'Ngarko';
-$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['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.';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'Ndrysho';
 $labels['cancel'] = 'Anullo';
 $labels['save']   = 'Ruaj';
 $labels['delete'] = 'Fshi';
-$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['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['listgroup'] = 'List group members';
 $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['autodetect']  = 'Auto';
 $labels['language']  = 'Gjuha';
 $labels['timezone']  = 'Brezi orar';
 $labels['pagesize']  = 'Rreshtat për faqe';
 $labels['signature'] = 'Nënshkrim';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Shiko si duket';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Kutia';
 $labels['folders']  = 'Kutitë';
 $labels['foldername']  = 'Emër kutie';
@@ -489,55 +174,7 @@ $labels['messagecount'] = 'Mesazhe';
 $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['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 5a18aafca..d4b981318 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -15,30 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$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...';
@@ -48,129 +32,42 @@ $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['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['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['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['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';
 $messages['fileuploaderror'] = 'Ngarkimi i skedarit dështoi';
 $messages['filesizeerror'] = 'Skedari i ngarkuar e kalon madhësinë kufi prej $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $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['movingcontact'] = 'Moving 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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 4bdf25020..e2d40b1b6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -15,66 +15,44 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Добродошли на $product';
 $labels['username']  = 'Корисничко име';
 $labels['password']  = 'Лозинка';
 $labels['server']    = 'Сервер';
 $labels['login']     = 'Пријава';
-
-// taskbar
 $labels['logout']   = 'Одјава';
 $labels['mail']     = 'Сандуче';
 $labels['settings'] = 'Подешавања';
 $labels['addressbook'] = 'Именик';
-
-// mailbox names
 $labels['inbox']  = 'Примљене';
 $labels['drafts'] = 'U pripremi';
 $labels['sent']   = 'Послате';
 $labels['trash']  = 'Канта';
 $labels['junk']   = 'Смеће';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Наслов';
 $labels['from']    = 'Од';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'За';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Одговори';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Датум';
 $labels['size']    = 'Величина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
 $labels['readstatus'] = 'Статус поруке';
 $labels['listoptions'] = 'Излистај опције...';
-
 $labels['mailboxlist'] = 'Фасцикле';
 $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['download'] = 'Преузми (скидање)';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'Име датотекеe';
 $labels['filesize'] = 'Величина датотеке';
-
 $labels['addtoaddressbook'] = 'Додај у именик';
-
-// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Уто';
@@ -82,8 +60,6 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Суб';
-
-// weekdays long
 $labels['sunday']    = 'Недеља';
 $labels['monday']    = 'Понедељак';
 $labels['tuesday']   = 'Уторак';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'Среда';
 $labels['thursday']  = 'Четвртак';
 $labels['friday']    = 'Петак';
 $labels['saturday']  = 'Субота';
-
-// months short
 $labels['jan']	= 'Јан';
 $labels['feb']	= 'Феб';
 $labels['mar']	= 'Мар';
@@ -105,8 +79,6 @@ $labels['sep']	= 'Сеп';
 $labels['oct']	= 'Окт';
 $labels['nov']	= 'Нов';
 $labels['dec']	= 'Дец';
-
-// months long
 $labels['longjan']	= 'Јануар';
 $labels['longfeb']	= 'Фебруар';
 $labels['longmar']	= 'Март';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'Септембар';
 $labels['longoct']	= 'Октобар';
 $labels['longnov']	= 'Новембар';
 $labels['longdec']	= 'Децембар';
-
 $labels['today'] = 'Данас';
-
-// toolbar buttons
 $labels['refresh']          = 'Освежи';
 $labels['checkmail']        = 'Провера нових порука';
 $labels['compose']          = 'Нова порука';
@@ -133,7 +102,6 @@ $labels['replytoallmessage'] = 'Одговори пошиљаоцу и свим
 $labels['replyall']         = 'Одговори свима';
 $labels['replylist']        = 'Листа за одговоре';
 $labels['forward']          = 'Проследи';
-$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Проследи као прилог';
 $labels['forwardmessage']   = 'Проследи поруку';
 $labels['deletemessage']    = 'Избриши поруку';
@@ -155,7 +123,6 @@ $labels['moreactions']      = 'Остале радње...';
 $labels['more']             = 'Више';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Опције';
-
 $labels['select'] = 'Одабери';
 $labels['all'] = 'Све';
 $labels['none'] = 'Ништа';
@@ -163,20 +130,13 @@ $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
-$labels['withattachment'] = 'With attachment';
 $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'] = 'Застава';
@@ -188,33 +148,19 @@ $labels['asc'] = 'растући';
 $labels['desc'] = 'опадајући';
 $labels['listcolumns'] = 'Лист колона';
 $labels['listsorting'] = 'Сортирање колонe';
-$labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'Лист режим приказивања';
-
 $labels['folderactions'] = 'Поставке фасцикле';
 $labels['compact'] = 'Компакција';
 $labels['empty'] = 'Испразни';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'Квота';
 $labels['unknown']  = 'непозната';
 $labels['unlimited']  = 'бесконачна';
-
 $labels['quicksearch']  = 'Брза претрага';
 $labels['resetsearch']  = 'Прикажи све поруке';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'Цела порука';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
 $labels['editasnew']      = 'Модификуј као ново';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Пошаљи поруку';
 $labels['savemessage']    = 'Сачувај у Снимљене';
 $labels['addattachment']  = 'Приложи датотеку';
@@ -224,52 +170,37 @@ $labels['returnreceipt']  = 'Потврда о приспећу';
 $labels['dsn']            = 'Обавештење о статусу слања поруке';
 $labels['mailreplyintro'] = 'Дана $date, $sender је написао:';
 $labels['originalmessage'] = 'Оригинална порука';
-
 $labels['editidents']    = 'Модификуј псеудониме';
 $labels['spellcheck']    = 'Провера правописа';
 $labels['checkspelling'] = 'Провера правописа';
 $labels['resumeediting'] = 'Повратак у режим писања';
 $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['highest'] = 'Највиши';
-
 $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'] = 'Пажња: Ово обавештење само потврђује да је порука приказана на рачунару примаоца. Не постоји гаранција да је прималац прочитао или разумео садржај поруке.';
-
-// address boook
 $labels['name']         = 'Пуно име';
 $labels['firstname']    = 'Име';
 $labels['surname']      = 'Презиме';
@@ -304,7 +235,6 @@ $labels['search'] = 'Тражи';
 $labels['advsearch'] = 'Напредна претрага';
 $labels['advanced'] = 'Напредно';
 $labels['other'] = 'Остало';
-
 $labels['typehome']   = 'Кућа';
 $labels['typework']   = 'Посао';
 $labels['typeother']  = 'Остало';
@@ -319,14 +249,12 @@ $labels['typeassistant']  = 'Асистент';
 $labels['typehomepage']  = 'Почетна страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
-
 $labels['addfield'] = 'Додај поље';
 $labels['addcontact'] = 'Додај нови контакт';
 $labels['editcontact'] = 'Измени контакт';
 $labels['contacts'] = 'Конакти';
 $labels['contactproperties'] = 'Својства контакта';
 $labels['personalinfo'] = 'Личне информације';
-
 $labels['edit']   = 'Измени';
 $labels['cancel'] = 'Откажи';
 $labels['save']   = 'Сачувај';
@@ -335,61 +263,43 @@ $labels['rename'] = 'Преименуј';
 $labels['addphoto'] = 'Додај';
 $labels['replacephoto'] = 'Измени';
 $labels['uploadphoto'] = 'Постави фотографију';
-
 $labels['newcontact']     = 'Додај нови контакт';
 $labels['deletecontact']  = 'Обриши одабране контакте';
 $labels['composeto']      = 'Напиши поруку...';
 $labels['contactsfromto'] = 'Контакти $from до $to од укупно $count';
 $labels['print']          = 'Штампај';
 $labels['export']         = 'Извези';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Извези конакте у vCard формату';
 $labels['newcontactgroup'] = 'Креирај нову контакт групу';
 $labels['grouprename']    = 'Преименуј групу';
 $labels['groupdelete']    = 'Обриши групу';
 $labels['groupremoveselected'] = 'Избриши изабране контакте из групе';
-
 $labels['previouspage']   = 'Прикажи претходну страну';
 $labels['firstpage']      = 'Прикажи први скуп';
 $labels['nextpage']       = 'Прикажи следећу страну';
 $labels['lastpage']       = 'Прикажи последњи скуп';
-
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групе';
-$labels['listgroup'] = 'List group members';
 $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'] = 'Форматирани датум';
@@ -400,13 +310,9 @@ $labels['timezone']  = 'Временска зона';
 $labels['pagesize']  = 'Редова по страни';
 $labels['signature'] = 'Потпис';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфејс';
 $labels['logoutclear'] = 'Избриши смеће при логовању';
@@ -414,24 +320,13 @@ $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['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'никад';
 $labels['immediately']  = 'одмах';
 $labels['messagesdisplaying'] = 'прикажи поруке';
@@ -440,7 +335,6 @@ $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'] = 'Проверите све фасцикле за нове поруке';
@@ -453,7 +347,6 @@ $labels['maintenance'] = 'Поправке';
 $labels['newmessage'] = 'Нова порука';
 $labels['signatureoptions'] = 'Опције потписа';
 $labels['whenreplying'] = 'При одговору';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Почни нову поруку преко оригинала';
 $labels['replybottomposting'] = 'Почни нову поруку испод оригинала';
 $labels['replyremovesignature'] = 'При одговору одстрани оригинални потпис из поруке';
@@ -466,21 +359,12 @@ $labels['afternseconds']  = 'након $n секунди';
 $labels['reqmdn'] = 'Увек затражи повратну скрипту';
 $labels['reqdsn'] = 'Увек затражи обавештење о статусу слања поруке';
 $labels['replysamefolder'] = 'Сачувај одговоре у фасциклу поруке на коју се одговара';
-$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['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'Фасцикла';
 $labels['folders']  = 'Фасцикле';
 $labels['foldername']  = 'Име фасцикле';
@@ -501,26 +385,19 @@ $labels['foldertype'] = 'типа фасцикле';
 $labels['personalfolder']  = 'Приватна фасцикла';
 $labels['otherfolder']  = 'Фасцикла Других Корисникa';
 $labels['sharedfolder']  = 'Јавна фасцикла';
-
 $labels['sortby'] = 'Сортирај по';
 $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'] = 'Западна Европа';
@@ -539,5 +416,4 @@ $labels['vietnamese'] = 'Вијетнамски';
 $labels['japanese'] = 'Јапански';
 $labels['korean'] = 'Кореански';
 $labels['chinese'] = 'Кинески';
-
 ?>
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 016cef163..7a4c89356 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Дошло је до грешке!';
 $messages['loginfailed']  = 'Неуспешно пријављивање';
 $messages['cookiesdisabled'] = 'Ваш интернет прегледач не подржава колачиће';
@@ -28,8 +26,6 @@ $messages['dberror'] = 'Грешка у бази података!';
 $messages['requesttimedout'] = 'Захтев је истекао';
 $messages['errorreadonly'] = 'Не може да изврши операцију. Фасцикла се може само читати.';
 $messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Погрешан захтев! Подаци нису сачувани.';
 $messages['invalidhost'] = 'Погрешно име сервера.';
 $messages['nomessagesfound'] = 'Немате порука у сандучету.';
@@ -56,8 +52,6 @@ $messages['contactnotfound'] = 'Жељени контакт није нађен'
 $messages['contactsearchonly'] = 'Унесите шта тражите да пронађете контакте';
 $messages['sendingfailed'] = 'Грешка при слању поруке';
 $messages['senttooquickly'] = 'Молимо Вас да сачекате $sec секунд(и) пре него пошаљете ову поруку';
-$messages['errorsavingsent'] = 'Приликом похрањивања послате поруке десила се грешка';
-$messages['errorsaving'] = 'Грешка при снимању поруке';
 $messages['errormoving'] = 'Грешка при премештању поруке';
 $messages['errorcopying'] = 'Копирање поруке није било успешно';
 $messages['errordeleting'] = 'Грешка при брисању поруке';
@@ -101,16 +95,11 @@ $messages['converting'] = 'Уклањање форматирања из пору
 $messages['messageopenerror'] = 'Порука се не може учитати са сервера';
 $messages['fileuploaderror'] = 'Слање датотеке неуспешно';
 $messages['filesizeerror'] = 'Послата датотека не може да прекорачи величину од $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Овај извор адресе је само за читање';
 $messages['errorsavingcontact'] = 'Неуспело снимање адресе контакта';
 $messages['movingmessage'] = 'Премештам поруку...';
 $messages['copyingmessage'] = 'Копирам поруке...';
 $messages['copyingcontact'] = 'Умножава контакте...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'бришем поруке...';
 $messages['markingmessage'] = 'Означавам поруке...';
 $messages['addingmember'] = 'Додаје контакте у групу...';
@@ -129,8 +118,6 @@ $messages['importwait'] = 'Увоз података, молимо сачека�
 $messages['importformaterror'] = 'Увоз је неуспешан! Послата датотека није допуштена за увоз.';
 $messages['importconfirm'] = '<b>Успешно увезжени $inserted контакти </b>';
 $messages['importconfirmskipped'] = '<b>Прескочени $skipped постојећи уноси </b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Операција није дозвољена!';
 $messages['nofromaddress'] = 'Недостаје имејл адреса у изабраном налогу';
 $messages['editorwarning'] = 'Пребацивање на обичан текст едитор ће изазвати губитак целог форматирања. Да ли желите да наставите?';
@@ -144,7 +131,6 @@ $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Имејл адреса није валидна: $email';
 $messages['toomanyrecipients'] = 'Превише прималаца. Смањите број прималаца на $max.';
 $messages['maxgroupmembersreached'] = 'Број чланова гупе прелази максимум од $max';
-$messages['internalerror'] = 'Десила се интерна грешка. Молимо покушајте поново';
 $messages['contactdelerror'] = 'Брисање контакта неуспешно';
 $messages['contactdeleted'] = 'Брисање контакта успешно';
 $messages['contactrestoreerror'] = 'Не може да врати обрисане контакте.';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'Не може да направи/премес
 $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 7169aeba8..48f71ab57 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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';
-
-// mailbox names
 $labels['inbox']  = 'Inkorg';
 $labels['drafts'] = 'Utkast';
 $labels['sent']   = 'Skickat';
 $labels['trash']  = 'Papperskorg';
 $labels['junk']   = 'Skräp';
 $labels['show_real_foldernames'] = 'Visa verkliga namn på särskilda kataloger';
-
-// message listing
 $labels['subject'] = 'Ämne';
 $labels['from']    = 'Avsändare';
 $labels['sender']  = 'Avsändare';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Lässtatus';
 $labels['listoptions'] = 'Listalternativ...';
-
 $labels['mailboxlist'] = '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:';
@@ -68,13 +56,9 @@ $labels['download'] = 'Ladda ner';
 $labels['open']     = 'Öppna';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'ons';
 $labels['thu'] = 'tor';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'lör';
-
-// weekdays long
 $labels['sunday']    = 'söndag';
 $labels['monday']    = 'måndag';
 $labels['tuesday']   = 'tisdag';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'onsdag';
 $labels['thursday']  = 'torsdag';
 $labels['friday']    = 'fredag';
 $labels['saturday']  = 'lördag';
-
-// months short
 $labels['jan']	= 'jan';
 $labels['feb']	= 'feb';
 $labels['mar']	= 'mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'sep';
 $labels['oct']	= 'okt';
 $labels['nov']	= 'nov';
 $labels['dec']	= 'dec';
-
-// months long
 $labels['longjan']	= 'januari';
 $labels['longfeb']	= 'februari';
 $labels['longmar']	= 'mars';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'september';
 $labels['longoct']	= 'oktober';
 $labels['longnov']	= 'november';
 $labels['longdec']	= 'december';
-
 $labels['today'] = 'idag';
-
-// toolbar buttons
 $labels['refresh']          = 'Uppdatera';
 $labels['checkmail']        = 'Hämta nya meddelanden';
 $labels['compose']          = 'Nytt meddelande';
@@ -155,7 +130,6 @@ $labels['moreactions']      = 'Fler åtgärder';
 $labels['more']             = 'Fler';
 $labels['back']             = 'Tillbaka';
 $labels['options']          = 'Alternativ';
-
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Importera meddelanden';
-
 $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['body']  = 'Innehåll';
 $labels['type'] = 'Typ';
-
+$labels['namex'] = 'Namn';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
 $labels['changeformattext'] = 'Visa i text-format';
 $labels['changeformathtml'] = 'Visa i HTML-format';
-
-// message compose
 $labels['editasnew']      = 'Redigera som nytt';
 $labels['send']           = 'Skicka';
 $labels['sendmessage']    = 'Skicka meddelande';
@@ -224,26 +192,22 @@ $labels['returnreceipt']  = 'Mottagarkvitto';
 $labels['dsn']            = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
-
 $labels['editidents']    = 'Ändra identiteter';
 $labels['spellcheck']    = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = 'Återuppta redigering';
 $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['highest'] = 'Högst';
-
 $labels['nosubject']  = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Namn';
 $labels['firstname']    = 'Förnamn';
 $labels['surname']      = 'Efternamn';
@@ -304,7 +262,6 @@ $labels['search'] = 'Sök';
 $labels['advsearch'] = 'Avancerad sökning';
 $labels['advanced'] = 'Avancerad';
 $labels['other'] = 'Annat';
-
 $labels['typehome']   = 'Hem';
 $labels['typework']   = 'Arbete';
 $labels['typeother']  = 'Annat';
@@ -319,14 +276,12 @@ $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['cancel'] = 'Avbryt';
 $labels['save']   = 'Spara';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Ny kontaktgrupp';
 $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['group'] = 'Grupp';
 $labels['groups'] = 'Kontaktgrupper';
 $labels['listgroup'] = 'Visa gruppmedlemmar';
 $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['importtarget'] = 'Lägg till kontakter i';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
+$labels['importgroups'] = 'Importera grupptillhörigheter';
+$labels['importgroupsall'] = 'Alla (skapa grupper om nödvändigt)';
+$labels['importgroupsexisting'] = 'Endast till befintliga grupper';
 $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';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Hantera popup-rutor som standardfönster';
 $labels['forwardmode'] = 'Vidarebefordra meddelande';
 $labels['inline'] = 'Infogat';
 $labels['asattachment'] = 'Bilaga';
-
 $labels['folder']  = 'Katalog';
 $labels['folders']  = 'Kataloger';
 $labels['foldername']  = 'Katalognamn';
@@ -501,26 +448,20 @@ $labels['foldertype'] = 'Katalogtyp';
 $labels['personalfolder']  = 'Privat katalog';
 $labels['otherfolder']  = 'Annan användares katalog';
 $labels['sharedfolder']  = 'Publik katalog';
-
 $labels['sortby'] = 'Sortera på';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $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 d0c58a97d..2773ae4c7 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'Efterfrågad kontakt hittades inte';
 $messages['contactsearchonly'] = 'Ange sökord för att hitta kontakter';
 $messages['sendingfailed'] = 'Meddelandet kunde inte skickas';
 $messages['senttooquickly'] = 'Vänta ytterligare $sec sekunder med att skicka meddelandet';
-$messages['errorsavingsent'] = 'Ett fel inträffade när det skickade meddelandet skulle sparas';
-$messages['errorsaving'] = 'Meddelandet kunde inte sparas';
 $messages['errormoving'] = 'Meddelandet kunde inte flyttas';
 $messages['errorcopying'] = 'Meddelandet kunde inte kopieras';
 $messages['errordeleting'] = 'Meddelandet kunde inte tas bort';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Felaktig adress: $email';
 $messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max';
 $messages['maxgroupmembersreached'] = 'Antalet gruppmedlemmar får inte överstiga $max';
-$messages['internalerror'] = 'Ett internt fel uppstod. Försök igen.';
 $messages['contactdelerror'] = 'Kontakt kunde inte tas bort';
 $messages['contactdeleted'] = 'Kontakt borttagen.';
 $messages['contactrestoreerror'] = 'Borttagna kontakter kunde inte återskapas';
@@ -172,5 +167,4 @@ $messages['parentnotwritable'] = 'Katalogen kunde inte skapas eller flyttas. Åt
 $messages['messagetoobig'] = 'Denna del av meddelandet är alltför stor för att hantera.';
 $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 197e80606..dd8c134ba 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -15,66 +15,39 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'நல்வரவு';
 $labels['username']  = 'பயனர்';
 $labels['password']  = 'கடவுச்சொல்';
 $labels['server']    = 'சேவையகம்';
 $labels['login']     = 'நுழை';
-
-// taskbar
 $labels['logout']   = 'வெளியேறு';
 $labels['mail']     = 'மின்னஞ்சல்';
 $labels['settings'] = 'அமைப்புகள்';
 $labels['addressbook'] = 'தொடர்புகள்';
-
-// mailbox names
 $labels['inbox']  = 'அகப்பெட்டி';
 $labels['drafts'] = 'வரைவுகள்';
 $labels['sent']   = 'அனுப்பிய அஞ்சல்';
 $labels['trash']  = 'குப்பை';
 $labels['junk']   = 'எரிதம்';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'தலைப்பு';
 $labels['from']    = 'அனுப்புனர்';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'பெறுனர்';
 $labels['cc']      = 'நகல்';
 $labels['bcc']     = 'மறை நகல்';
 $labels['replyto'] = 'பதிலளி';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'தேதி';
 $labels['size']    = 'அளவு';
 $labels['priority'] = 'முக்கியத்துவம்';
 $labels['organization'] = 'நிறுவனம்';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
-
 $labels['mailboxlist'] = 'அடைவுகள்';
 $labels['messagesfromto'] = 'செய்திகள் $countல் $from லிருந்து $to வரை';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$countல் $nr வது செய்தி';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'நகல்';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'கோப்பு பெயர்';
 $labels['filesize'] = 'கோப்பு அளவு';
-
 $labels['addtoaddressbook'] = 'தொடர்புகளுக்கு சேர்க்கவும்';
-
-// weekdays short
 $labels['sun'] = 'ஞாயிறு';
 $labels['mon'] = 'திங்கள்';
 $labels['tue'] = 'செவ்வாய்';
@@ -82,8 +55,6 @@ $labels['wed'] = 'புதன்';
 $labels['thu'] = 'வியாழன்';
 $labels['fri'] = 'வெள்ளி';
 $labels['sat'] = 'சனி';
-
-// weekdays long
 $labels['sunday']    = 'ஞாயிறு';
 $labels['monday']    = 'திங்கள்';
 $labels['tuesday']   = 'செவ்வாய்';
@@ -91,8 +62,6 @@ $labels['wednesday'] = 'புதன்';
 $labels['thursday']  = 'வியாழன்';
 $labels['friday']    = 'வெள்ளி';
 $labels['saturday']  = 'சனி';
-
-// months short
 $labels['jan']	= 'சனவரி';
 $labels['feb']	= 'பிப்ரவரி';
 $labels['mar']	= 'மார்ச்';
@@ -105,8 +74,6 @@ $labels['sep']	= 'செப்டம்பர்';
 $labels['oct']	= 'அக்டோபர்';
 $labels['nov']	= 'நவம்பர்';
 $labels['dec']	= 'டிசம்பர்';
-
-// months long
 $labels['longjan']	= 'சனவரி';
 $labels['longfeb']	= 'பிப்ரவரி';
 $labels['longmar']	= 'மார்ச்';
@@ -119,22 +86,12 @@ $labels['longsep']	= 'செப்டம்பர்';
 $labels['longoct']	= 'அக்டோபர்';
 $labels['longnov']	= 'நவம்பர்';
 $labels['longdec']	= 'டிசம்பர்';
-
 $labels['today'] = 'இன்று';
-
-// toolbar buttons
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'புது அஞ்சல்களை பார்க்கவும்';
 $labels['compose']          = 'அஞ்சல் எழுது';
 $labels['writenewmessage']  = 'புது அஞ்சல் எழுதவும்';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'அனுப்புனருக்கு பதிலளி';
 $labels['replytoallmessage'] = 'அனுப்புனர் மற்றும் எல்லா பெறுனர்களுக்கும் பதிலளி';
-$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'] = 'செய்தியை குப்பைக்கு நகர்த்து';
@@ -145,253 +102,104 @@ $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['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'பயன்பாட்டு அளவு';
 $labels['unknown']  = 'தெரியாத';
 $labels['unlimited']  = 'அளவில்லா';
-
 $labels['quicksearch']  = 'விரைவு தேடல்';
 $labels['resetsearch']  = 'தேடலை மறுஅமை';
 $labels['searchmod']  = 'மாற்றிகளை தேடு';
 $labels['msgtext']  = 'முழு செய்தி';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'கோப்பு இணைப்புகள்';
 $labels['upload'] = 'பதிவேற்று';
-$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['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'] = 'குறிப்பு: இந்த ஒப்புகை பெறுனரிடம் செய்தியை காட்டியதற்காக வருகிறது. அவர் அதை படித்ததற்கு எந்த உத்திரவாதமும் இல்லை';
-
-// 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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'திருத்து';
 $labels['cancel'] = 'ரத்து';
 $labels['save']   = 'சேமி';
 $labels['delete'] = 'நீக்கு';
-$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['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['listgroup'] = 'List group members';
 $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']  = 'தானியங்கி';
@@ -400,13 +208,8 @@ $labels['timezone']  = 'நேர மண்டலம்';
 $labels['pagesize']  = 'ஒரு பக்கத்திற்கான வரிகள்';
 $labels['signature'] = 'கையொப்பம்';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'முந்திய பாத்தியை காட்டு';
 $labels['skin'] = 'முகப்பு தோற்றம்';
 $labels['logoutclear'] = 'வெளியேறும் போது குப்பையை காலி செய்';
@@ -417,43 +220,33 @@ $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['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'] = 'பதிலளிக்கும் போது அசல் கையெழுத்தை செய்தியிலிருந்து நீக்கவும்';
@@ -461,26 +254,6 @@ $labels['autoaddsignature'] = 'தானாக கையொப்பத்த
 $labels['newmessageonly'] = 'புது செய்தி மட்டும்';
 $labels['replyandforwardonly'] = 'பதிலளிப்பு முன்அனுப்பு மட்டும்';
 $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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-
 $labels['folder']  = 'அடைவு';
 $labels['folders']  = 'அடைவுகள்';
 $labels['foldername']  = 'அடைவு பெயர்';
@@ -490,54 +263,11 @@ $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['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 22466351a..d496b3836 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -15,30 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
-$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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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'] = 'செய்தியை அனுப்புகிறது...';
@@ -48,31 +35,21 @@ $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['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த செய்திகளை நீக்க விரும்புகிறீர்களா ?';
 $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']  = 'தயவு செய்து பெயரை எழுதுங்கள்';
@@ -86,51 +63,27 @@ $messages['noldapserver'] = 'தயவு செய்து தேடுவத�
 $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'] = 'சேவையகத்திலிருந்து செய்தியை ஏற்ற முடியவில்லை';
 $messages['fileuploaderror'] = 'கோப்பு ஏற்றம் தோல்வியடாந்தது';
 $messages['filesizeerror'] = 'ஏற்றிய கோப்பு அதிகபட்ச அளவான $size-ஐ மீறியது';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'இந்த முகவரியின் மூலத்தை படிக்க மட்டும்தான் முடியும்';
 $messages['errorsavingcontact'] = 'தொடர்பு முகவரியை சேமிக்க முடியவில்லை';
 $messages['movingmessage'] = 'செய்தியை நகர்த்துகிறது...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving 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['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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'பணி அனுமதிக்கப்படவில்லை!';
 $messages['nofromaddress'] = 'நீங்கள் தேர்ந்தெடுத்த அடையாளத்தில் மின்னஞ்சல் இல்லை';
 $messages['editorwarning'] = 'எளிய உரை திருத்திக்கு மாறுவதன் மூலம் எல்லா உரை வடிவங்களும் தொலைந்து போகக் கூடும். தொடர விரும்புகிறீர்களா ?';
@@ -142,35 +95,4 @@ $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 85b091e5b..9ee0858e2 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'ยินดีต้อนรับสู่ $product';
 $labels['username']  = 'บัญชีผู้ใช้';
 $labels['password']  = 'รหัสผ่าน';
 $labels['server']    = 'เซิร์ฟเวอร์';
 $labels['login']     = 'เข้าสู่ระบบ';
-
-// taskbar
 $labels['logout']   = 'ออกจากระบบ';
 $labels['mail']     = 'อีเมล์';
 $labels['settings'] = 'ปรับแต่งค่าส่วนตัว';
 $labels['addressbook'] = 'สมุดรายชื่อ';
-
-// mailbox names
 $labels['inbox']  = 'กล่องขาเข้า';
 $labels['drafts'] = 'กล่องจดหมายร่าง';
 $labels['sent']   = 'กล่องขาออก';
 $labels['trash']  = 'ถังขยะ';
 $labels['junk']   = 'กล่องจดหมายขยะ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'หัวจดหมาย';
 $labels['from']    = 'ผู้ส่ง';
 $labels['sender']  = 'ผู้ส่ง';
@@ -47,34 +36,23 @@ $labels['to']      = 'ผู้รับ';
 $labels['cc']      = 'คัดลอก';
 $labels['bcc']     = 'แอบสำเนาถึง';
 $labels['replyto'] = 'ตอบกลับ';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'วันที่';
 $labels['size']    = 'ขนาด';
 $labels['priority'] = 'ระดับความสำคัญ';
 $labels['organization'] = 'องค์กร';
 $labels['readstatus'] = 'สถานะการเปิดอ่าน';
 $labels['listoptions'] = 'ตัวเลือกการแสดงรายการ';
-
 $labels['mailboxlist'] = 'กล่องจดหมาย';
 $labels['messagesfromto'] = 'จดหมายจาก $from ถึง $to จำนวน $count ฉบับ';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'จดหมายฉบับที่ $nr จาก $count ฉบับ';
-$labels['fromtoshort'] = '$from – $to of $count';
-
 $labels['copy']     = 'คัดลอก';
 $labels['move']     = 'เลื่อน';
 $labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'แสดง';
-$labels['showanyway'] = 'Show it anyway';
-
 $labels['filename'] = 'ชื่อไฟล์';
 $labels['filesize'] = 'ขนาดไฟล์';
-
 $labels['addtoaddressbook'] = 'บันทึกในสมุดรายชื่อ';
-
-// weekdays short
 $labels['sun'] = 'อ';
 $labels['mon'] = 'จ';
 $labels['tue'] = 'อ';
@@ -82,8 +60,6 @@ $labels['wed'] = 'พ';
 $labels['thu'] = 'พฤ';
 $labels['fri'] = 'ศ';
 $labels['sat'] = 'ส';
-
-// weekdays long
 $labels['sunday']    = 'วันอาทิตย์';
 $labels['monday']    = 'วันจันทร์';
 $labels['tuesday']   = 'วันอังคาร';
@@ -91,8 +67,6 @@ $labels['wednesday'] = 'วันพุธ';
 $labels['thursday']  = 'วันพฤหัสบดี';
 $labels['friday']    = 'วันศุกร์';
 $labels['saturday']  = 'วันเสาร์';
-
-// months short
 $labels['jan']	= 'ม.ค.';
 $labels['feb']	= 'ก.พ.';
 $labels['mar']	= 'มี.ค.';
@@ -105,8 +79,6 @@ $labels['sep']	= 'ก.ย.';
 $labels['oct']	= 'ต.ค.';
 $labels['nov']	= 'พ.ย.';
 $labels['dec']	= 'ธ.ค.';
-
-// months long
 $labels['longjan']	= 'มกราคม';
 $labels['longfeb']	= 'กุมภาพันธ์';
 $labels['longmar']	= 'มีนาคม';
@@ -119,10 +91,7 @@ $labels['longsep']	= 'กันยายน';
 $labels['longoct']	= 'ตุลาคม';
 $labels['longnov']	= 'พฤศจิกายน';
 $labels['longdec']	= 'ธันวาคม';
-
 $labels['today'] = 'วันนี้';
-
-// toolbar buttons
 $labels['refresh']          = 'รีเฟรช';
 $labels['checkmail']        = 'ตรวจสอบจดหมายใหม่';
 $labels['compose']          = 'เขียนจดหมายใหม่';
@@ -133,7 +102,6 @@ $labels['replytoallmessage'] = 'ตอบกลับถึงทุกคนใ
 $labels['replyall']         = 'ตอบกลับทั้งหมด';
 $labels['replylist']        = 'รายชื่อตอบกลับ';
 $labels['forward']          = 'ส่งต่อ';
-$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'ส่งต่อเป็นไฟล์แนบ';
 $labels['forwardmessage']   = 'ส่งต่อจดหมาย';
 $labels['deletemessage']    = 'ลบจดหมาย';
@@ -149,127 +117,59 @@ $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['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
-$labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'ยังไม่ได้ตอบ';
-$labels['withattachment'] = 'With attachment';
 $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['importmessages'] = 'Import messages';
-
 $labels['quota'] = 'พื้นที่ใช้งาน';
 $labels['unknown']  = 'ไม่ทราบ';
 $labels['unlimited']  = 'ไม่จำกัด';
-
 $labels['quicksearch']  = 'ค้นหาแบบด่วน';
 $labels['resetsearch']  = 'ล้างการค้นหา';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
 $labels['body']  = 'เนื้อหา';
-$labels['type'] = 'Type';
-
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// 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['attach'] = 'Attach';
 $labels['attachments'] = 'ไฟล์แนบ';
 $labels['upload'] = 'อัพโหลด';
-$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['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['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']      = 'สกุล';
@@ -280,7 +180,6 @@ $labels['nickname']     = 'ชื่อเล่น';
 $labels['jobtitle']     = 'ตำแหน่งงาน';
 $labels['department']   = 'แผนก';
 $labels['gender']       = 'เพศ';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'อีเมล์';
 $labels['phone']        = 'โทรศัพท์';
 $labels['address']      = 'ที่อยู่';
@@ -290,52 +189,38 @@ $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['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-
 $labels['edit']   = 'แก้ไข';
 $labels['cancel'] = 'ยกเลิก';
 $labels['save']   = 'บันทึก';
 $labels['delete'] = 'ลบ';
 $labels['rename'] = 'เปลี่ยนชื่อ';
 $labels['addphoto'] = 'เพิ่ม';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
-
 $labels['newcontact']     = 'สร้างรายชื่อใหม่';
 $labels['deletecontact']  = 'ลบรายชื่อที่เลือก';
 $labels['composeto']      = 'เขียนจดหมายถึง';
@@ -344,143 +229,40 @@ $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['listgroup'] = 'List group members';
-$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['autodetect']  = 'Auto';
 $labels['language']  = 'ภาษา';
 $labels['timezone']  = 'เขตเวลา';
 $labels['pagesize']  = 'จำนวนจดหมายต่อหน้า';
 $labels['signature'] = 'ลายมือชื่อ';
 $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['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'แสดงหน้าต่างตัวอย่างแสดงผล';
-$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['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['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
 $labels['asattachment'] = 'เป็นไฟล์แนบ';
-
 $labels['folder']  = 'กล่องจดหมาย';
 $labels['folders']  = 'กล่องจดหมาย';
 $labels['foldername']  = 'ชื่อกล่องจดหมาย';
@@ -493,51 +275,21 @@ $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['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 cf9a1cde8..46d960aff 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -15,22 +15,13 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'ชื่อเซิร์ฟเวอร์ไม่ถูกต้อง';
 $messages['nomessagesfound'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
 $messages['loggedout'] = 'ทำการออกจากระบบเรียบร้อย';
@@ -48,22 +39,14 @@ $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['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']  = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
@@ -71,106 +54,32 @@ $messages['contactdeleting'] = 'กำลังลบรายชื่อผู
 $messages['groupdeleting'] = 'กำลังลบกลุ่ม...';
 $messages['folderdeleting'] = 'กำลังลบโฟลเดอร์...';
 $messages['foldermoving'] = 'กำลังย้ายโฟลเดอร์...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ฟอร์มยังไม่ครบถ้วนสมบูรณ์';
 $messages['noemailwarning'] = 'โปรดใส่อีเมล์ให้ถูกต้อง';
 $messages['nonamewarning']  = 'โปรดใส่ชื่อ';
 $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้า';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
 $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 ได้';
 $messages['fileuploaderror'] = 'การอัพโหลดล้มเหลว';
 $messages['filesizeerror'] = 'ไฟล์มีขนาดใหญ่เกิน $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'จดหมายนี้เป็นแบบอ่านอย่างเดียว';
 $messages['errorsavingcontact'] = 'ไม่สามารถบันทึกรายชื่อได้';
 $messages['movingmessage'] = 'กำลังย้ายข้อความ...';
 $messages['copyingmessage'] = 'กำลังคัดลอกข้อความ...';
 $messages['copyingcontact'] = 'กำลังคัดลอกรายชื่อผู้ติดต่อ...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$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 c62c5c079..bcecd51f7 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
-$labels['welcome']   = '$product, Hoş Geldiniz';
+$labels['welcome']   = '$product E-Posta Sistemine 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';
-
-// mailbox names
 $labels['inbox']  = 'Gelen';
 $labels['drafts'] = 'Taslaklar';
 $labels['sent']   = 'Giden';
 $labels['trash']  = 'Çöp';
 $labels['junk']   = 'İstenmeyen';
 $labels['show_real_foldernames'] = 'Özel klasörler için gerçek isimleri göster';
-
-// message listing
 $labels['subject'] = 'Konu';
 $labels['from']    = 'Gönderen';
 $labels['sender']  = 'Gönderici';
@@ -54,13 +44,11 @@ $labels['priority'] = 'Öncelik';
 $labels['organization'] = 'Kuruluş';
 $labels['readstatus'] = 'Okunma durumu';
 $labels['listoptions'] = 'Seçenekleri listele...';
-
 $labels['mailboxlist'] = '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şı...';
@@ -68,13 +56,9 @@ $labels['download'] = 'İndir';
 $labels['open']     = 'Aç';
 $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';
@@ -82,8 +66,6 @@ $labels['wed'] = 'Çrş';
 $labels['thu'] = 'Per';
 $labels['fri'] = 'Cum';
 $labels['sat'] = 'Cts';
-
-// weekdays long
 $labels['sunday']    = 'Paz';
 $labels['monday']    = 'Pazartesi';
 $labels['tuesday']   = 'Salı';
@@ -91,8 +73,6 @@ $labels['wednesday'] = 'Çarşamba';
 $labels['thursday']  = 'Perşembe';
 $labels['friday']    = 'Cuma';
 $labels['saturday']  = 'Cumartesi';
-
-// months short
 $labels['jan']	= 'Oca';
 $labels['feb']	= 'Şub';
 $labels['mar']	= 'Mar';
@@ -105,8 +85,6 @@ $labels['sep']	= 'Eyl';
 $labels['oct']	= 'Eki';
 $labels['nov']	= 'Kas';
 $labels['dec']	= 'Ara';
-
-// months long
 $labels['longjan']	= 'Ocak';
 $labels['longfeb']	= 'Şubat';
 $labels['longmar']	= 'Mart';
@@ -119,10 +97,7 @@ $labels['longsep']	= 'Eylül';
 $labels['longoct']	= 'Ekim';
 $labels['longnov']	= 'Kasım';
 $labels['longdec']	= 'Aralık';
-
 $labels['today'] = 'Bugün';
-
-// toolbar buttons
 $labels['refresh']          = 'Yenile';
 $labels['checkmail']        = 'Yeni Postaları Kontrol Et';
 $labels['compose']          = 'E-Posta Yaz';
@@ -155,7 +130,6 @@ $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';
@@ -174,7 +148,6 @@ $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';
@@ -190,29 +163,24 @@ $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['importmessages'] = 'Mesajları içe aktar';
-
 $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['body']  = 'Gövde';
 $labels['type'] = 'Tip';
-
+$labels['namex'] = 'Ad';
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
 $labels['changeformattext'] = 'Düz yazı formatında göster';
 $labels['changeformathtml'] = 'HTML formatında göster';
-
-// message compose
 $labels['editasnew']      = 'Postayı yeni olarak düzenle';
 $labels['send']           = 'Gönder';
 $labels['sendmessage']    = 'Postayı gönder';
@@ -224,26 +192,22 @@ $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['checkspelling'] = 'Yazım denetimi yap';
 $labels['resumeediting'] = 'Düzenlemeye devam et';
 $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['highest'] = 'En yüksek';
-
 $labels['nosubject']  = '(Konu Belirtilmemiş)';
 $labels['showimages'] = 'Resimleri göster';
 $labels['alwaysshow'] = '$sender tarafından gönderilen resimleri her zaman göster';
@@ -251,25 +215,19 @@ $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.';
-
-// address boook
 $labels['name']         = 'Görüntülenen isim';
 $labels['firstname']    = 'Ad';
 $labels['surname']      = 'Soyad';
@@ -304,7 +262,6 @@ $labels['search'] = 'Ara';
 $labels['advsearch'] = 'Gelişmiş ara';
 $labels['advanced'] = 'Gelişmiş';
 $labels['other'] = 'Diğer';
-
 $labels['typehome']   = 'Ev';
 $labels['typework']   = 'İş';
 $labels['typeother']  = 'Diğer';
@@ -319,14 +276,12 @@ $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['cancel'] = 'İptal';
 $labels['save']   = 'Kaydet';
@@ -335,7 +290,6 @@ $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';
@@ -349,42 +303,36 @@ $labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
 $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['group'] = 'Grup';
 $labels['groups'] = 'Gruplar';
 $labels['listgroup'] = 'Grup üyelerini listele';
 $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:';
-$labels['importtarget'] = 'Yeni kişiler eklenecek adres defteri:';
+$labels['importtarget'] = 'Kişileri ekle';
 $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
+$labels['importgroups'] = 'Grup atamalarını içe aktar';
+$labels['importgroupsall'] = 'Tümü (Gerekirse grupları oluştur)';
+$labels['importgroupsexisting'] = 'Sadece mevcut gruplar için';
 $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';
@@ -480,7 +428,6 @@ $labels['standardwindows'] = 'Popup pencerelerini standart pencere olarak yönet
 $labels['forwardmode'] = 'Posta yönlendirme';
 $labels['inline'] = 'postanın içinde';
 $labels['asattachment'] = 'ek olarak';
-
 $labels['folder']  = 'Klasör';
 $labels['folders']  = 'Klasörler';
 $labels['foldername']  = 'Klasör Adı';
@@ -501,26 +448,20 @@ $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['sortby'] = 'Sırala';
 $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';
@@ -539,5 +480,4 @@ $labels['vietnamese'] = 'Vietnamca';
 $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 3f728b523..0b2ac1e46 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Tarayıcınız çerezleri kabul etmiyor';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = 'İstenen kişi bulunamadı';
 $messages['contactsearchonly'] = 'Kişi aramak için arama terimleri giriniz';
 $messages['sendingfailed'] = 'Posta gönderilemedi';
 $messages['senttooquickly'] = 'Lütfen bu postayı göndermeden önce $sec saniye bekleyin';
-$messages['errorsavingsent'] = 'Gönderilen postayı kaydederken hata oluştu';
-$messages['errorsaving'] = 'Kaydederken bir hata oluştu';
 $messages['errormoving'] = 'Posta taşınamadı';
 $messages['errorcopying'] = 'Posta kopyalanamadı';
 $messages['errordeleting'] = 'Posta silinemedi';
@@ -101,13 +97,16 @@ $messages['converting'] = 'Postanın biçimlendirmesi kaldırılıyor...';
 $messages['messageopenerror'] = 'Sunucudan posta yüklenemedi';
 $messages['fileuploaderror'] = 'Dosya yükleme başarısız';
 $messages['filesizeerror'] = 'Yüklenen dosya en büyük dosya boyunu ($size) aşıyor';
-$messages['copysuccess'] = '$nr adres kopyalandı';
-$messages['copyerror'] = 'Hiçbir adres kopyalanamadı';
+$messages['copysuccess'] = '$nr adet kişi başarıyla kopyalandı.';
+$messages['movesuccess'] = '$nr adet kişi başarıyla taşındı.';
+$messages['copyerror'] = 'Kişiler kopyalanamadı.';
+$messages['moveerror'] = 'Kişiler taşınamadı.';
 $messages['sourceisreadonly'] = 'Adres kaynağı salt okunur durumda';
 $messages['errorsavingcontact'] = 'Kişinin adresi kaydedilemedi';
 $messages['movingmessage'] = 'Posta(lar) taşınıyor...';
 $messages['copyingmessage'] = 'Posta(lar) kopyalanıyor...';
 $messages['copyingcontact'] = 'Kişile(ler) kopyalanıyor...';
+$messages['movingcontact'] = 'Kişi(ler) taşınıyor...';
 $messages['deletingmessage'] = 'Posta(lar) siliniyor...';
 $messages['markingmessage'] = 'Posta(lar) işaretleniyor...';
 $messages['addingmember'] = 'Gruba kişi(ler) ekleniyor...';
@@ -141,7 +140,6 @@ $messages['smtperror'] = 'SMTP Hatası: $msg';
 $messages['emailformaterror'] = 'Hatalı e-posta adresi: $email';
 $messages['toomanyrecipients'] = 'Çok fazla alıcı. En fazla $max alıcı girebilirsiniz.';
 $messages['maxgroupmembersreached'] = 'Grup üyelerinin sayısı $max sınırını aşıyor.';
-$messages['internalerror'] = 'Bir hata oluştu. Lütfen tekrar deneyin.';
 $messages['contactdelerror'] = 'Kişi(ler) silinemedi';
 $messages['contactdeleted'] = 'Kişi(ler) silindi';
 $messages['contactrestoreerror'] = 'Silinen kişi(ler) geri getirilemiyor.';
@@ -169,5 +167,4 @@ $messages['parentnotwritable'] = 'Klasör, seçilen üst klasöre taşınamıyor
 $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 bb483012b..f530c212e 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = 'Ласкаво просимо до $product';
 $labels['username']  = 'Ім\'я користувача';
 $labels['password']  = 'Пароль';
 $labels['server']    = 'Сервер';
 $labels['login']     = 'Увійти';
-
-// taskbar
 $labels['logout']   = 'Вийти';
 $labels['mail']     = 'Пошта';
 $labels['settings'] = 'Налаштування';
 $labels['addressbook'] = 'Контакти';
-
-// mailbox names
 $labels['inbox']  = 'Вхідні';
 $labels['drafts'] = 'Чернетки';
 $labels['sent']   = 'Надіслані';
 $labels['trash']  = 'Кошик';
 $labels['junk']   = 'Спам';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Тема';
 $labels['from']    = 'Відправник';
 $labels['sender']  = 'Відправник';
@@ -54,13 +43,11 @@ $labels['priority'] = 'Пріоритет';
 $labels['organization'] = 'Організація';
 $labels['readstatus'] = 'Статус прочитання';
 $labels['listoptions'] = 'Налаштування списку...';
-
 $labels['mailboxlist'] = 'Папки';
 $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']   = 'Перемістити до...';
@@ -68,13 +55,9 @@ $labels['download'] = 'Завантажити';
 $labels['open']     = 'Відкрити';
 $labels['showattachment'] = 'Показати';
 $labels['showanyway'] = 'Все одно показати';
-
 $labels['filename'] = 'Ім\'я файлу';
 $labels['filesize'] = 'Розмір файлу';
-
 $labels['addtoaddressbook'] = 'Додати до контактів';
-
-// weekdays short
 $labels['sun'] = 'Нд';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -82,8 +65,6 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-
-// weekdays long
 $labels['sunday']    = 'Неділя';
 $labels['monday']    = 'Понеділок';
 $labels['tuesday']   = 'Вівторок';
@@ -91,8 +72,6 @@ $labels['wednesday'] = 'Середа';
 $labels['thursday']  = 'Четвер';
 $labels['friday']    = 'П\'ятниця';
 $labels['saturday']  = 'Субота';
-
-// months short
 $labels['jan']	= 'січ';
 $labels['feb']	= 'лют';
 $labels['mar']	= 'бер';
@@ -105,8 +84,6 @@ $labels['sep']	= 'вер';
 $labels['oct']	= 'жов';
 $labels['nov']	= 'лис';
 $labels['dec']	= 'гр';
-
-// months long
 $labels['longjan']	= 'Січень';
 $labels['longfeb']	= 'Лютий';
 $labels['longmar']	= 'Березень';
@@ -119,10 +96,7 @@ $labels['longsep']	= 'Вересень';
 $labels['longoct']	= 'Жовтень';
 $labels['longnov']	= 'Листопад';
 $labels['longdec']	= 'Грудень';
-
 $labels['today'] = 'Сьогодні';
-
-// toolbar buttons
 $labels['refresh']          = 'Оновити';
 $labels['checkmail']        = 'Перевірити пошту';
 $labels['compose']          = 'Написати листа';
@@ -155,7 +129,6 @@ $labels['moreactions']      = 'Інші дії...';
 $labels['more']             = 'Ще';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметри';
-
 $labels['select'] = 'Вибрати';
 $labels['all'] = 'Всі';
 $labels['none'] = 'Не сортувати';
@@ -163,7 +136,6 @@ $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Видалені';
 $labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
@@ -174,7 +146,6 @@ $labels['expand-all'] = 'Розкрити всі';
 $labels['expand-unread'] = 'Розкрити непрочитані';
 $labels['collapse-all'] = 'Згорнути всі';
 $labels['threaded'] = 'Гілками';
-
 $labels['autoexpand_threads'] = 'Розкривати гілки';
 $labels['do_expand'] = 'усі гілки';
 $labels['expand_only_unread'] = 'тільки з непрочитаними листами';
@@ -190,30 +161,23 @@ $labels['listcolumns'] = 'Атрибути для відображення';
 $labels['listsorting'] = 'Сортувати за атрибутом';
 $labels['listorder'] = 'Порядок сортування';
 $labels['listmode'] = 'Режим перегляду';
-
 $labels['folderactions'] = 'Операції з папкою...';
 $labels['compact'] = 'Стиснути';
 $labels['empty'] = 'Спорожнити';
 $labels['importmessages'] = 'Імпорт повідомлень';
-
 $labels['quota'] = 'Використано';
 $labels['unknown']  = 'невідомо';
 $labels['unlimited']  = 'без обмеження';
-
 $labels['quicksearch']  = 'Швидкий пошук';
 $labels['resetsearch']  = 'Очистити пошук';
 $labels['searchmod']  = 'Де шукати';
 $labels['msgtext']  = 'В усьому листі';
 $labels['body']  = 'Тіло повідомлення';
-$labels['type'] = 'Type';
 $labels['namex'] = 'Ім\'я';
-
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
 $labels['changeformattext'] = 'Відображення в текстовому форматі';
 $labels['changeformathtml'] = 'Відображення у форматі HTML';
-
-// message compose
 $labels['editasnew']      = 'Редагувати як новий';
 $labels['send']           = 'Відправлено';
 $labels['sendmessage']    = 'Надіслати зараз';
@@ -225,26 +189,22 @@ $labels['returnreceipt']  = 'Запит відповіді';
 $labels['dsn']            = 'Повідомлення про доставку';
 $labels['mailreplyintro'] = '$date, $sender написав:';
 $labels['originalmessage'] = 'Оригінальне повідомлення';
-
 $labels['editidents']    = 'Змінити данні';
 $labels['spellcheck']    = 'Орфографія';
 $labels['checkspelling'] = 'Перевірити орфографію';
 $labels['resumeediting'] = 'Продовжити редагування';
 $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['highest'] = 'Найвищий';
-
 $labels['nosubject']  = '(без теми)';
 $labels['showimages'] = 'Показувати зображення';
 $labels['alwaysshow'] = 'Завжди показувати зображення від $sender';
@@ -252,25 +212,19 @@ $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'] = 'Зауваження: Це повідомлення означає лише, що листа було відкрито одержувачем, і не гарантує того, що його було прочитано.';
-
-// address boook
 $labels['name']         = 'Ім`я для відображення';
 $labels['firstname']    = 'Ім`я';
 $labels['surname']      = 'Прізвище';
@@ -305,7 +259,6 @@ $labels['search'] = 'Пошук';
 $labels['advsearch'] = 'Розширений пошук';
 $labels['advanced'] = 'Додатково';
 $labels['other'] = 'Інше';
-
 $labels['typehome']   = 'Дім';
 $labels['typework']   = 'Робота';
 $labels['typeother']  = 'Інше';
@@ -320,14 +273,12 @@ $labels['typeassistant']  = 'Помічник';
 $labels['typehomepage']  = 'Домашня сторінка';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профіль';
-
 $labels['addfield'] = 'Додати поле...';
 $labels['addcontact'] = 'Додати вибрані контакти до списку контактів';
 $labels['editcontact'] = 'Редагувати контакт';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Властивості контакта';
 $labels['personalinfo'] = 'Особова інформація';
-
 $labels['edit']   = 'Правка';
 $labels['cancel'] = 'Скасувати';
 $labels['save']   = 'Зберегти';
@@ -336,7 +287,6 @@ $labels['rename'] = 'Перейменувати';
 $labels['addphoto'] = 'Додати';
 $labels['replacephoto'] = 'Замінити';
 $labels['uploadphoto'] = 'Завантажити фотографію';
-
 $labels['newcontact']     = 'Створити новий контакт';
 $labels['deletecontact']  = 'Видалити вибрані контакти';
 $labels['composeto']      = 'Створити листа для вибранних контактів';
@@ -350,45 +300,32 @@ $labels['newcontactgroup'] = 'Створити нову групу контак�
 $labels['grouprename']    = 'Перейменувати групу';
 $labels['groupdelete']    = 'Видалити групу';
 $labels['groupremoveselected'] = 'Видалити обрані контакти з групи';
-
 $labels['previouspage']   = 'Попередня сторінка';
 $labels['firstpage']      = 'Перша сторінка';
 $labels['nextpage']       = 'Наступна сторінка';
 $labels['lastpage']       = 'Остання сторінка';
-
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групи';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Персональні адреси';
-
 $labels['searchsave'] = 'Зберегти пошук';
 $labels['searchdelete'] = 'Видалити пошук';
-
 $labels['import'] = 'Імпорт';
 $labels['importcontacts'] = 'Імпортувати контакти';
 $labels['importfromfile'] = 'Імпортувати з файлу:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = 'Замінити всю адресну книгу';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
 $labels['importgroupsexisting'] = 'Лише для існуючих груп';
 $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';
@@ -410,7 +347,6 @@ $labels['htmleditor'] = 'Створювати листи в HTML';
 $labels['htmlonreply'] = 'тільки у відповідь на HTML повідомлення';
 $labels['htmlonreplyandforward'] = 'під час пересилання або відповіді на повідомлення HTML';
 $labels['htmlsignature'] = 'Підпис в HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Показати панель перегляду';
 $labels['skin'] = 'Тема';
 $labels['logoutclear'] = 'Очищати кошик при виході';
@@ -480,11 +416,9 @@ $labels['spellcheckignorenums'] = 'Ігнорувати слова із числ
 $labels['spellcheckignorecaps'] = 'Ігнорувати слова із великими буквами';
 $labels['addtodict'] = 'Додати до словника';
 $labels['mailtoprotohandler'] = 'Зареєструвати обробник для посилань mailto';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Пересилання повідомлень';
 $labels['inline'] = 'у тексті';
 $labels['asattachment'] = 'як вкладення';
-
 $labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Назва папки';
@@ -505,26 +439,20 @@ $labels['foldertype'] = 'Тип каталогу';
 $labels['personalfolder']  = 'Приватний каталог';
 $labels['otherfolder']  = 'Каталог іншого користувача';
 $labels['sharedfolder']  = 'Публічний каталог';
-
 $labels['sortby'] = 'Відсортувати за';
 $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'] = 'Західноєвропейське';
@@ -543,5 +471,4 @@ $labels['vietnamese'] = 'В\'єтнамське';
 $labels['japanese'] = 'Японське';
 $labels['korean'] = 'Корейське';
 $labels['chinese'] = 'Китайське';
-
 ?>
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 2a114803f..669190c2e 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = 'Виникла помилка!';
 $messages['loginfailed']  = 'Невдала спроба входу';
 $messages['cookiesdisabled'] = 'Ваш переглядач не приймає cookie';
@@ -28,8 +26,7 @@ $messages['dberror'] = 'Помилка бази даних!';
 $messages['requesttimedout'] = 'Тайм-аут запиту';
 $messages['errorreadonly'] = 'Неможливо виконати операцію. Папка доступна тільки для читання.';
 $messages['errornoperm'] = 'Неможливо виконати операцію. Доступ заборонено';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['erroroverquota'] = 'Неможливо виконати операцію. Немає вільного місця на диску.';
 $messages['invalidrequest'] = 'Невірний запит! Дані не збережено.';
 $messages['invalidhost'] = 'Невірне ім\'я серверу.';
 $messages['nomessagesfound'] = 'Листів не знайдено';
@@ -56,8 +53,6 @@ $messages['contactnotfound'] = 'Запитаний контакт не знай�
 $messages['contactsearchonly'] = 'Введіть деякі критерії пошуку, щоб знайти контакти';
 $messages['sendingfailed'] = 'Не вдалося відправити листа';
 $messages['senttooquickly'] = 'Будь ласка, зачекайте $sec секунд для відправки листа';
-$messages['errorsavingsent'] = 'Помилка при збереженні відправленого листа';
-$messages['errorsaving'] = 'Помилка при збереженні';
 $messages['errormoving'] = 'Не вдалося перемістити листи';
 $messages['errorcopying'] = 'Не вдалося зкопіювати листи';
 $messages['errordeleting'] = 'Не вдалося видалити листи';
@@ -101,16 +96,11 @@ $messages['converting'] = 'Видалення форматування...';
 $messages['messageopenerror'] = 'Не вдалося завантажити повідомлення з сервера';
 $messages['fileuploaderror'] = 'Не вдалося вкласти файл';
 $messages['filesizeerror'] = 'Розмір вибраного файлу перевищує максимально дозволений ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Дане джерело адрес доступне лише для читання';
 $messages['errorsavingcontact'] = 'Неможливо зберегти адресу контакту';
 $messages['movingmessage'] = 'Переміщення листа...';
 $messages['copyingmessage'] = 'Копіювання листа...';
 $messages['copyingcontact'] = 'Копіювання контакту(ів)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Видалення листа (ів)';
 $messages['markingmessage'] = 'Позначення листа (ів)';
 $messages['addingmember'] = 'Додання контакту(ів) до групи...';
@@ -129,8 +119,7 @@ $messages['importwait'] = 'Імпортування, будь ласка, зач
 $messages['importformaterror'] = 'Помилка імпорту! Завантажений файл має невідомий формат даних.';
 $messages['importconfirm'] = '<b>Успішно імпортовано $inserted контактів, пропущено $skipped існуючих</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Пропущені $skipped наявні записи</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessageerror'] = 'Імпорт не вдався! Завантажений файл не є припустимим повідомлення або файлом поштової скриньки';
 $messages['opnotpermitted'] = 'Дія заборонена!';
 $messages['nofromaddress'] = 'В обраному профілі не вистачає адреси електронної пошти';
 $messages['editorwarning'] = 'Перемикання в режим звичайного тексту спричинить втрату всього форматування. Продовжити?';
@@ -144,7 +133,6 @@ $messages['smtperror'] = 'Помилка SMTP: $msg';
 $messages['emailformaterror'] = 'Невірна електронна адреса: $email';
 $messages['toomanyrecipients'] = 'Занадто багато отримувачів. Зменшіть їх число до $max.';
 $messages['maxgroupmembersreached'] = 'Число адрес у групі перевищило максимум у $max.';
-$messages['internalerror'] = 'Виникла внутрішня помилка. Будь ласка, спробуйте ще раз';
 $messages['contactdelerror'] = 'Неможливо видалити контакт(и)';
 $messages['contactdeleted'] = 'Контакт(и) видалено успішно';
 $messages['contactrestoreerror'] = 'Неможливо відновити видалений(і) контакт(и).';
@@ -172,5 +160,4 @@ $messages['parentnotwritable'] = 'Неможливо створити/перем
 $messages['messagetoobig'] = 'Частина повідомлення занадто велика для опрацювання.';
 $messages['attachmentvalidationerror'] = 'УВАГА! Це вкладення є підозрілим, тому що його тип не збігається з типом, оголошеним у повідомленні. Якщо ви не довіряєте відправнику, ви не повинні відкривати його в браузері, оскільки його вміст може бути шкідливим.<br/><br/><em>Очікуване: $expected; знайдене: $detected </em>';
 $messages['noscriptwarning'] = 'Увага: Даний клієнт електронної пошти потрібує Javascript! Для того, щоб використовувати його необхідно включити підтримку Javascript в налаштуваннях вашого браузера.';
-
 ?>
diff --git a/program/localization/ur_PK/labels.inc b/program/localization/ur_PK/labels.inc
new file mode 100644
index 000000000..797c98f11
--- /dev/null
+++ b/program/localization/ur_PK/labels.inc
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/labels.inc                                        |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
+*/
+$labels['welcome']   = ' $product میں خوش آمدید';
+$labels['server']    = 'سَروَر';
+$labels['mail']     = 'میل';
+$labels['settings'] = 'ترتیبات';
+$labels['download'] = 'ڈاؤن لوڈ';
+$labels['showanyway'] = 'جیسا بھی ہے ظاہر کر دیں';
+$labels['markread']         = 'جیسے پڑھ لیا ہو';
+$labels['markunread']       = 'جیسے ابھی نہ پڑھا ہو';
+$labels['more']             = 'مزید';
+$labels['back']             = 'واپس';
+$labels['select'] = 'مۃنتخب کریں';
+$labels['all'] = 'تمام';
+$labels['none'] = 'کوئی نہیں';
+$labels['currpage'] = 'موجودہ حفحہ';
+$labels['unread'] = 'نہیں پڑھا';
+$labels['deleted'] = 'ختم ہو گیا';
+$labels['undeleted'] = 'ختم نہیں ہُوا';
+$labels['invert'] = 'شکل تبدیل کریں';
+$labels['list'] = 'لِسٹ';
+$labels['expand-all'] = 'تمام کھولیں';
+$labels['attachment'] = 'مُنسلَک شُدہ';
+$labels['nonesort'] = 'کوئی نہیں';
+?>
diff --git a/program/localization/ur_PK/messages.inc b/program/localization/ur_PK/messages.inc
new file mode 100644
index 000000000..da4e39679
--- /dev/null
+++ b/program/localization/ur_PK/messages.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/messages.inc                                      |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
+*/
+?>
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index aad0dafe6..6bd6d4402 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// 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ỉ';
-
-// 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['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = 'Tiêu đề';
 $labels['from']    = 'Người gửi';
 $labels['sender']  = 'Người gửi';
@@ -54,27 +43,20 @@ $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['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['download'] = 'Tải về';
-$labels['open']     = 'Open';
 $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';
@@ -82,8 +64,6 @@ $labels['wed'] = 'Thứ Tư';
 $labels['thu'] = 'Thứ Năm';
 $labels['fri'] = 'Thứ Sáu';
 $labels['sat'] = 'Thứ Bảy';
-
-// weekdays long
 $labels['sunday']    = 'Chủ Nhật';
 $labels['monday']    = 'Thứ Hai';
 $labels['tuesday']   = 'Thứ Ba';
@@ -91,8 +71,6 @@ $labels['wednesday'] = 'Thứ Tư';
 $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';
@@ -105,8 +83,6 @@ $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';
@@ -119,10 +95,7 @@ $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';
-
-// toolbar buttons
 $labels['refresh']          = 'Nạp lại';
 $labels['checkmail']        = 'Kiểm tra thư mới';
 $labels['compose']          = 'Soạn thư';
@@ -155,7 +128,6 @@ $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ó';
@@ -163,7 +135,7 @@ $labels['currpage'] = 'Trang hiện tại';
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
 $labels['unanswered'] = 'Chưa trả lời';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'Có tệp tin đính kèm';
 $labels['deleted'] = 'Đã xóa';
 $labels['undeleted'] = 'Chưa xóa được';
 $labels['invert'] = 'Đảo ngược';
@@ -174,7 +146,6 @@ $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';
@@ -190,29 +161,23 @@ $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['importmessages'] = 'Import messages';
-
 $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['body']  = 'Nội dung thư';
-$labels['type'] = 'Type';
-
+$labels['type'] = 'Định dạng';
+$labels['namex'] = 'Họ tên';
 $labels['openinextwin'] = 'Mở trong khung cửa mới';
 $labels['emlsave'] = 'Tải về theo định dạng .eml';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
+$labels['changeformattext'] = 'Hiển thị ở chế độ text';
+$labels['changeformathtml'] = 'Hiển thị ở chế độ HTML';
 $labels['editasnew']      = 'Sửa như một email mới';
 $labels['send']           = 'Gửi';
 $labels['sendmessage']    = 'Gửi thư';
@@ -224,26 +189,22 @@ $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['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['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['highest'] = 'Cao nhất';
-
 $labels['nosubject']  = '(Không có chủ đề)';
 $labels['showimages'] = 'Hiển thị ảnh';
 $labels['alwaysshow'] = 'Luôn luôn hiển thị ảnh từ $sender';
@@ -251,25 +212,19 @@ $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ư.';
-
-// address boook
 $labels['name']         = 'Tên hiển thị';
 $labels['firstname']    = 'Tên Gọi';
 $labels['surname']      = 'Tên Họ';
@@ -304,7 +259,6 @@ $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['typehome']   = 'Thư mục chính';
 $labels['typework']   = 'Cơ quan';
 $labels['typeother']  = 'Loại khác';
@@ -319,14 +273,12 @@ $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['cancel'] = 'Huỷ';
 $labels['save']   = 'Lưu';
@@ -335,7 +287,6 @@ $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';
@@ -349,42 +300,32 @@ $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['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['group'] = 'Nhóm';
 $labels['groups'] = 'Các nhóm';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Danh sách các thành viên 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';
@@ -406,7 +347,6 @@ $labels['htmleditor'] = 'Soạn thư dạng HTML';
 $labels['htmlonreply'] = 'Chỉ trả lời lại bằng thư HTML';
 $labels['htmlonreplyandforward'] = 'Khi chuyển tiếp hoặc trả lời thư theo định dạng HTML';
 $labels['htmlsignature'] = 'Chữ ký HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Hiển thị ô Xem thử';
 $labels['skin'] = 'Bề mặt giao diện';
 $labels['logoutclear'] = 'Xóa sạch rác khi thoát';
@@ -476,11 +416,9 @@ $labels['spellcheckignorenums'] = 'Bỏ qua các từ kèm số';
 $labels['spellcheckignorecaps'] = 'Bỏ qua các từ được viết hoa';
 $labels['addtodict'] = 'Thêm vào từ điển';
 $labels['mailtoprotohandler'] = 'Xác định cách xử lý giao thức mailto: liên kết';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $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['folders']  = 'Các thư mục';
 $labels['foldername']  = 'Tên thư mục';
@@ -501,26 +439,20 @@ $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['sortby'] = 'Soạn theo';
 $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';
@@ -539,5 +471,4 @@ $labels['vietnamese'] = 'Tiếng Việt';
 $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 769a21afd..b2d7c71ff 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -15,8 +15,6 @@
 
  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['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
@@ -28,8 +26,6 @@ $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. 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['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $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.';
@@ -56,8 +52,6 @@ $messages['contactnotfound'] = 'Không tìm thấy liên lạc được yêu c�
 $messages['contactsearchonly'] = 'Gõ một vài từ tìm kiếm để tìm liên hệ';
 $messages['sendingfailed'] = 'Không gửi được thư';
 $messages['senttooquickly'] = 'Xin đợi vài giây trước khi gửi thư này';
-$messages['errorsavingsent'] = 'Xuất hiện một lỗi trong khi lưu thư đã gửi';
-$messages['errorsaving'] = 'Lỗi trong quá trình lưu.';
 $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ư';
@@ -101,16 +95,11 @@ $messages['converting'] = 'Loại bỏ định dạng...';
 $messages['messageopenerror'] = 'Không thể tải thư từ máy chủ';
 $messages['fileuploaderror'] = 'Tải tập tin lên thất bại';
 $messages['filesizeerror'] = 'Tập tin được tải lên vượt quá dung lượng tối đa....';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Nguồn địa chỉ này chỉ cho đọc';
 $messages['errorsavingcontact'] = 'Không thể lưu địa chỉ liên lạc';
 $messages['movingmessage'] = 'Đang chuyển thư...';
 $messages['copyingmessage'] = 'Đang sao chép thư...';
 $messages['copyingcontact'] = 'Đang sao chép liên lạc...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Đang xóa thư...';
 $messages['markingmessage'] = 'Đánh dấu thư...';
 $messages['addingmember'] = 'Đang thêm liên lạc vào nhóm...';
@@ -129,8 +118,6 @@ $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['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $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?';
@@ -144,7 +131,6 @@ $messages['smtperror'] = 'Lỗi SMTP: $msg';
 $messages['emailformaterror'] = 'Địa chỉ email không hợp lệ';
 $messages['toomanyrecipients'] = 'Quá nhiều người nhận. Hãy giảm số lượng người nhận xuống tối đa là $max.';
 $messages['maxgroupmembersreached'] = 'Số lượng thành viên trong nhóm vượt quá mức tối đa là $max.';
-$messages['internalerror'] = 'Xuất hiện một lỗi nội bộ. Xin hãy thử lại';
 $messages['contactdelerror'] = 'Không thể xóa liên lạc';
 $messages['contactdeleted'] = 'Liên lạc được xóa thành công';
 $messages['contactrestoreerror'] = 'Không thể khôi phục liên lạc đã xóa';
@@ -172,5 +158,4 @@ $messages['parentnotwritable'] = 'Không thể tạo/chuyển folder vào folder
 $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 b568a7008..1d9c04733 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -15,31 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '欢迎使用 $product';
 $labels['username']  = '用户名';
 $labels['password']  = '密码';
 $labels['server']    = '服务器';
 $labels['login']     = '登录';
-
-// taskbar
 $labels['logout']   = '注销';
 $labels['mail']     = '邮件';
 $labels['settings'] = '设置';
 $labels['addressbook'] = '通讯录';
-
-// mailbox names
 $labels['inbox']  = '收件箱';
 $labels['drafts'] = '草稿箱';
 $labels['sent']   = '已发送邮件';
 $labels['trash']  = '已删除邮件';
 $labels['junk']   = '垃圾邮件';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
-
-// message listing
 $labels['subject'] = '主题';
 $labels['from']    = '发件人';
 $labels['sender']  = '发件人';
@@ -54,13 +43,11 @@ $labels['priority'] = '优先级';
 $labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
 $labels['listoptions'] = '列表选项';
-
 $labels['mailboxlist'] = '邮件夹';
-$labels['messagesfromto'] = '第 $from 到 $to，共计 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to，共计 $count 个主题';
+$labels['messagesfromto'] = '从 $from 到 $to，共计 $count 封邮件';
+$labels['threadsfromto'] = '从 $from 到 $to，共计 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件，共计 $count 封';
-$labels['fromtoshort'] = '自 $from – $to 统计 $count';
-
+$labels['fromtoshort'] = '$from – $to 共计 $count 个';
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
 $labels['moveto']   = '移至...';
@@ -68,13 +55,9 @@ $labels['download'] = '下载';
 $labels['open']     = '打开';
 $labels['showattachment'] = '显示';
 $labels['showanyway'] = '总是显示';
-
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
-
 $labels['addtoaddressbook'] = '添加至通讯录';
-
-// weekdays short
 $labels['sun'] = '星期日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
@@ -82,8 +65,6 @@ $labels['wed'] = '星期三';
 $labels['thu'] = '星期四';
 $labels['fri'] = '星期五';
 $labels['sat'] = '星期六';
-
-// weekdays long
 $labels['sunday']    = '星期日';
 $labels['monday']    = '星期一';
 $labels['tuesday']   = '星期二';
@@ -91,8 +72,6 @@ $labels['wednesday'] = '星期三';
 $labels['thursday']  = '星期四';
 $labels['friday']    = '星期五';
 $labels['saturday']  = '星期六';
-
-// months short
 $labels['jan']	= '一月';
 $labels['feb']	= '二月';
 $labels['mar']	= '三月';
@@ -105,8 +84,6 @@ $labels['sep']	= '九月';
 $labels['oct']	= '十月';
 $labels['nov']	= '十一月';
 $labels['dec']	= '十二月';
-
-// months long
 $labels['longjan']	= '一月';
 $labels['longfeb']	= '二月';
 $labels['longmar']	= '三月';
@@ -119,10 +96,7 @@ $labels['longsep']	= '九月';
 $labels['longoct']	= '十月';
 $labels['longnov']	= '十一月';
 $labels['longdec']	= '十二月';
-
 $labels['today'] = '今天';
-
-// toolbar buttons
 $labels['refresh']          = '刷新';
 $labels['checkmail']        = '检查新邮件';
 $labels['compose']          = '撰写新邮件';
@@ -144,18 +118,17 @@ $labels['firstmessage']     = '显示第一封邮件';
 $labels['nextmessage']      = '下一封';
 $labels['lastmessage']      = '最后一封';
 $labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示原始邮件文件';
-$labels['mark']             = '标记';
+$labels['viewsource']       = '显示来源';
+$labels['mark']             = '标记为';
 $labels['markmessages']     = '标记选中的邮件为';
 $labels['markread']         = '已读';
 $labels['markunread']       = '未读';
-$labels['markflagged']      = '已标记';
-$labels['markunflagged']    = '未标记';
+$labels['markflagged']      = '重要';
+$labels['markunflagged']    = ' 不重要';
 $labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
 $labels['back']             = '返回';
-$labels['options']          = '选项';
-
+$labels['options']          = '个人选项';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
@@ -163,7 +136,7 @@ $labels['currpage'] = '当前页';
 $labels['unread'] = '未读邮件';
 $labels['flagged'] = '已标记邮件';
 $labels['unanswered'] = '未回复邮件';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = '包含附件';
 $labels['deleted'] = '已删除邮件';
 $labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
@@ -174,7 +147,6 @@ $labels['expand-all'] = '展开全部';
 $labels['expand-unread'] = '展开未读';
 $labels['collapse-all'] = '收起全部';
 $labels['threaded'] = '所有邮件';
-
 $labels['autoexpand_threads'] = '展开消息主题';
 $labels['do_expand'] = '所有主题';
 $labels['expand_only_unread'] = '仅未读消息';
@@ -190,29 +162,21 @@ $labels['listcolumns'] = '列表列';
 $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
-
 $labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
-$labels['importmessages'] = 'Import messages';
-
 $labels['quota'] = '邮箱容量';
 $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
-
 $labels['quicksearch']  = '快速查找';
 $labels['resetsearch']  = '清空';
 $labels['searchmod']  = '修改搜索';
 $labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
-$labels['type'] = 'Type';
-
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-
-// message compose
+$labels['changeformattext'] = '以文本格式显示';
+$labels['changeformathtml'] = '以 HTML 格式显示';
 $labels['editasnew']      = '以新邮件编辑';
 $labels['send']           = '发送';
 $labels['sendmessage']    = '立即发送';
@@ -224,52 +188,42 @@ $labels['returnreceipt']  = '需要已读回执';
 $labels['dsn']            = '投递状态通知';
 $labels['mailreplyintro'] = '在 $date，$sender 写道：';
 $labels['originalmessage'] = '原始邮件';
-
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
 $labels['resumeediting'] = '继续编辑';
 $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['highest'] = '最高';
-
 $labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
-$labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
+$labels['alwaysshow'] = '总是显示来自 $sender 的图片';
 $labels['isdraft']    = '这是一封草稿';
-$labels['andnmore']   = '第$nr封或更多...';
+$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'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或了解邮件内容。';
-
-// address boook
 $labels['name']         = '显示名称';
 $labels['firstname']    = '名字';
 $labels['surname']      = '姓氏';
@@ -304,7 +258,6 @@ $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
 $labels['other'] = '其他';
-
 $labels['typehome']   = '家庭';
 $labels['typework']   = '工作';
 $labels['typeother']  = '其他';
@@ -319,14 +272,12 @@ $labels['typeassistant']  = '助理';
 $labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
 $labels['typeprofile'] = '资料';
-
 $labels['addfield'] = '新增条目...';
 $labels['addcontact'] = '新建联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
 $labels['personalinfo'] = '个人信息';
-
 $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
@@ -335,7 +286,6 @@ $labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
 $labels['replacephoto'] = '替换照片';
 $labels['uploadphoto'] = '上传照片';
-
 $labels['newcontact']     = '新建联系人';
 $labels['deletecontact']  = '删除选中的联系人';
 $labels['composeto']      = '写信至选中的联系人';
@@ -347,44 +297,33 @@ $labels['exportsel']      = '导出选中';
 $labels['exportvcards']   = '导出联系人为 vCard 格式';
 $labels['newcontactgroup'] = '创建新的联系人群组';
 $labels['grouprename']    = '重命名群组';
-$labels['groupdelete']    = '删除群组组';
+$labels['groupdelete']    = '删除群组';
 $labels['groupremoveselected'] = '删除选中';
-
 $labels['previouspage']   = '上一页';
-$labels['firstpage']      = '第一页';
+$labels['firstpage']      = '首页';
 $labels['nextpage']       = '下一页';
-$labels['lastpage']       = '最后一页';
-
+$labels['lastpage']       = '末页';
 $labels['group'] = '分组';
 $labels['groups'] = '分组';
-$labels['listgroup'] = 'List group members';
 $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['identities'] = '发件人身份';
 $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
-
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '编辑条目';
-
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
@@ -403,16 +342,16 @@ $labels['dstactive']  = '夏令时';
 $labels['showinextwin'] = '在新窗口中打开';
 $labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
-$labels['htmlonreply'] = '仅当回复 HTML 邮件';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreply'] = '仅当回复 HTML 邮件时';
+$labels['htmlonreplyandforward'] = '仅当回复或转发 HTML 邮件时';
 $labels['htmlsignature'] = '使用 HTML 签名';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = '显示邮件地址时显示名字';
 $labels['previewpane'] = '显示预览窗口';
 $labels['skin'] = '界面皮肤';
 $labels['logoutclear'] = '退出时清空回收站';
 $labels['logoutcompact'] = '退出时压缩收件箱';
 $labels['uisettings'] = '用户界面';
-$labels['serversettings'] = '服务器设置';
+$labels['serversettings'] = '服务端设置';
 $labels['mailboxview'] = '显示邮件';
 $labels['mdnrequests'] = '发件人请求回执';
 $labels['askuser'] = '询问用户';
@@ -424,7 +363,7 @@ $labels['readwhendeleted'] = '删除后标记为已读';
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
 $labels['skipdeleted'] = '不显示标记为已删除的邮件';
 $labels['deletealways'] = '如果移动邮件到回收站失败，则删除';
-$labels['deletejunk'] = '在、';
+$labels['deletejunk'] = '直接删除垃圾邮箱中的邮件';
 $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
@@ -440,7 +379,7 @@ $labels['mimeparamfolding'] = '附件名';
 $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
-$labels['force7bit'] = '对8位字符使用 MIME 编码';
+$labels['force7bit'] = '对 8 位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
@@ -465,7 +404,7 @@ $labels['previewpanemarkread']  = '标记预览邮件为已读';
 $labels['afternseconds']  = '$n 秒之后';
 $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
-$labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
+$labels['replysamefolder'] = '保存回复邮件到邮件相同的文件夹';
 $labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
 $labels['listnamedisplay'] = '列出联系人为';
@@ -475,21 +414,19 @@ $labels['spellcheckignoresyms'] = '忽略带符号的单词';
 $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['mailtoprotohandler'] = '注册为处理 mailto 链接的程序';
 $labels['forwardmode'] = '邮件转发方式';
 $labels['inline'] = '内嵌';
 $labels['asattachment'] = '作为附件';
-
-$labels['folder']  = '目录管理';
-$labels['folders']  = '目录管理';
+$labels['folder']  = '文件夹管理';
+$labels['folders']  = '文件夹管理';
 $labels['foldername']  = '邮件夹名称';
 $labels['subscribed']  = '已订阅';
 $labels['messagecount'] = '邮件数量';
 $labels['create']  = '建立';
 $labels['createfolder']  = '建立新邮件夹';
 $labels['managefolders']  = '管理邮件夹';
-$labels['specialfolders'] = '定义邮件夹';
+$labels['specialfolders'] = '自定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
 $labels['parentfolder'] = '父文件夹';
@@ -497,30 +434,24 @@ $labels['location'] = '位置';
 $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
-$labels['foldertype'] = '目录类型';
-$labels['personalfolder']  = '私有目录';
-$labels['otherfolder']  = '他人目录';
-$labels['sharedfolder']  = '共享目录';
-
+$labels['foldertype'] = '文件夹类型';
+$labels['personalfolder']  = '私有文件夹';
+$labels['otherfolder']  = '他人文件夹';
+$labels['sharedfolder']  = '共享文件夹';
 $labels['sortby'] = '排序';
 $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'] = '西欧';
@@ -539,5 +470,4 @@ $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
-
 ?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 4c47f833e..bf6e8cf2f 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -15,119 +15,122 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = '发生错误！';
 $messages['loginfailed']  = '登录失败。';
-$messages['cookiesdisabled'] = '您的浏览器不接受 cookies。';
-$messages['sessionerror'] = '会话已过期。';
-$messages['storageerror'] = '连接到邮件服务器失败。';
+$messages['cookiesdisabled'] = '您的浏览器不支持 Cookies。';
+$messages['sessionerror'] = '会话无效或已过期。';
+$messages['storageerror'] = '连接至 IMAP 服务器失败。';
 $messages['servererror'] = '服务器错误！';
-$messages['servererrormsg'] = '服务器错误: $msg';
+$messages['servererrormsg'] = '服务器错误：$msg';
 $messages['dberror'] = '数据库错误！';
 $messages['requesttimedout'] = '请求超时';
-$messages['errorreadonly'] = '不可对只读文件夹进行操作。';
-$messages['errornoperm'] = '无权限操作';
-$messages['invalidrequest'] = '无效的请求！数据保存失败。';
-$messages['invalidhost'] = '非法主机名。';
+$messages['errorreadonly'] = '无法完成操作。文件夹为只读。';
+$messages['errornoperm'] = '无法完成操作。没有权限。';
+$messages['erroroverquota'] = '无法完成操作。没有足够的磁盘空间。';
+$messages['erroroverquotadelete'] = '没有足够的磁盘空间。请使用 SHIFT+DEL 删除一部分邮件。';
+$messages['invalidrequest'] = '请求无效！未保存数据。';
+$messages['invalidhost'] = '无效的主机名。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件。';
 $messages['loggedout'] = '您已成功注销，再见！';
-$messages['mailboxempty'] = '邮件夹为空';
-$messages['refreshing'] = '刷新中...';
+$messages['mailboxempty'] = '邮件夹为空。';
+$messages['refreshing'] = '正在刷新...';
 $messages['loading'] = '正在载入...';
 $messages['uploading'] = '正在上传文件...';
 $messages['uploadingmany'] = '正在上传文件...';
 $messages['loadingdata'] = '正在载入数据...';
 $messages['checkingmail'] = '正在检查新邮件...';
-$messages['sendingmessage'] = '正在发送邮件...';
-$messages['messagesent'] = '邮件发送成功。';
+$messages['sendingmessage'] = '正在发送...';
+$messages['messagesent'] = '邮件已发送。';
 $messages['savingmessage'] = '正在保存邮件...';
-$messages['messagesaved'] = '邮件已暂存到草稿箱。';
+$messages['messagesaved'] = '邮件已暂存至草稿箱。';
 $messages['successfullysaved'] = '保存成功。';
-$messages['addedsuccessfully'] = '成功添加联系人。';
+$messages['addedsuccessfully'] = '联系人已添加。';
 $messages['contactexists'] = '当前联系人的电子邮件地址已存在。';
-$messages['contactnameexists'] = '已存在同名的联系人。';
-$messages['blockedimages'] = '为保护隐私，此邮件中的远程图片未显示。';
+$messages['contactnameexists'] = '已存在同名联系人。';
+$messages['blockedimages'] = '由于保护隐私，此邮件中的远程图片未予显示。';
 $messages['encryptedmessage'] = '抱歉！该邮件已被加密，无法显示。';
 $messages['nocontactsfound'] = '未找到联系人。';
 $messages['contactnotfound'] = '未找到指定的联系人。';
 $messages['contactsearchonly'] = '请输入联系人的搜索条件';
 $messages['sendingfailed'] = '发送失败。';
-$messages['senttooquickly'] = '您需要等待 $sec 秒才能发送邮件。';
-$messages['errorsavingsent'] = '保存已发送邮件时发生错误。';
-$messages['errorsaving'] = '保存时发生错误。';
+$messages['senttooquickly'] = '您需要等待$sec秒才能发送邮件。';
 $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
-$messages['deletecontactconfirm']  = '确定要删除已选中的联系人？';
-$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
-$messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
-$messages['deletefolderconfirm']  = '确定要删除已选中的邮件夹？';
-$messages['purgefolderconfirm']  = '是否确认要删除当前邮件夹中的所有邮件？';
+$messages['deletecontactconfirm']  = '是否删除选中的联系人？';
+$messages['deletegroupconfirm']  = '是否删除选中的群组?';
+$messages['deletemessagesconfirm'] = '是否删除选中的邮件？';
+$messages['deletefolderconfirm']  = '是否删除选中的邮件夹？';
+$messages['purgefolderconfirm']  = '是否删除当前邮件夹中的全部邮件？';
 $messages['contactdeleting'] = '正在删除联系人...';
-$messages['groupdeleting'] = '正在删除组...';
+$messages['groupdeleting'] = '正在删除群组...';
 $messages['folderdeleting'] = '正在删除文件夹...';
 $messages['foldermoving'] = '正在移动文件夹...';
 $messages['foldersubscribing'] = '订阅文件夹中...';
 $messages['folderunsubscribing'] = '退订中...';
-$messages['formincomplete'] = '当前表单未填写完整，请完整填写。';
+$messages['formincomplete'] = '表单未填写完整。';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址。';
-$messages['nonamewarning']  = '请输入名字。';
-$messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
+$messages['nonamewarning']  = '请输入名称。';
+$messages['nopagesizewarning'] = '请输入每页显示的邮件数量。';
 $messages['nosenderwarning'] = '请输入发件人地址。';
-$messages['norecipientwarning'] = '至少需要一个收件人。';
+$messages['norecipientwarning'] = '至少输入一个收件人。';
 $messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗？';
-$messages['nobodywarning'] = '要发送无正文的邮件吗？';
+$messages['nobodywarning'] = '要发送没有正文的邮件吗？';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并舍弃当前邮件吗？';
-$messages['noldapserver'] = '请选择一个LDAP服务器进行查找。';
-$messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址。';
-$messages['notuploadedwarning'] = '附件还没有全部上传，请等待或者取消上传。';
+$messages['noldapserver'] = '请选择一个用来查找的 LDAP 服务器。';
+$messages['nosearchname'] = '请输入联系人姓名或电子邮件地址。';
+$messages['notuploadedwarning'] = '附件尚未全部上传，请耐心等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件。';
 $messages['contactsearchsuccessful'] = '共找到 $nr 位联系人。';
-$messages['searchnomatch'] = '未找到任何符合条件的邮件';
+$messages['searchnomatch'] = '未找到任何符合条件的邮件。';
 $messages['searching'] = '正在搜索...';
 $messages['checking'] = '正在检查...';
-$messages['nospellerrors'] = '未发现拼写错误';
-$messages['folderdeleted'] = '文件夹已被成功删除。';
-$messages['foldersubscribed'] = '成功订阅文件夹。';
-$messages['folderunsubscribed'] = '成功退订的文件夹。';
-$messages['folderpurged'] = '成功清空文件夹。';
+$messages['nospellerrors'] = '未发现拼写错误。';
+$messages['folderdeleted'] = '删除文件夹成功。';
+$messages['foldersubscribed'] = '订阅文件夹成功。';
+$messages['folderunsubscribed'] = '退订文件夹成功。';
+$messages['folderpurged'] = '清空文件夹成功。';
 $messages['folderexpunged'] = '文件夹已清空。';
 $messages['deletedsuccessfully'] = '删除成功。';
 $messages['converting'] = '格式转换中...';
-$messages['messageopenerror'] = '无法从服务器上加载邮件内容。';
+$messages['messageopenerror'] = '无法从服务器加载邮件内容。';
 $messages['fileuploaderror'] = '文件上传失败。';
 $messages['filesizeerror'] = '上传的文件超过了 $size 的大小限制。';
-$messages['copysuccess'] = '成功复制 $nr 个地址。';
-$messages['copyerror'] = '无法复制地址。';
+$messages['copysuccess'] = '成功复制 $nr 个联系人。';
+$messages['movesuccess'] = '成功移动 $nr 个联系人。';
+$messages['copyerror'] = '无法复制联系人。';
+$messages['moveerror'] = '无法移动联系人。';
 $messages['sourceisreadonly'] = '源地址为只读。';
-$messages['errorsavingcontact'] = '无法保存联系人的地址。';
-$messages['movingmessage'] = '移动邮件到...';
-$messages['copyingmessage'] = '复制邮件到...';
-$messages['copyingcontact'] = '复制联系人...';
+$messages['errorsavingcontact'] = '无法保存联系人地址。';
+$messages['movingmessage'] = '正在移动邮件...';
+$messages['copyingmessage'] = '正在复制邮件...';
+$messages['copyingcontact'] = '正在复制联系人...';
+$messages['movingcontact'] = '移动联系人...';
 $messages['deletingmessage'] = '正在删除邮件...';
 $messages['markingmessage'] = '正在标记邮件...';
-$messages['addingmember'] = '正在添加联系人到组...';
-$messages['removingmember'] = '正在从组中删除联系人...';
-$messages['receiptsent'] = '成功发送了一个已读回执。';
-$messages['errorsendingreceipt'] = '无法发送回执。';
-$messages['deleteidentityconfirm'] = '您真的想删除这个验证信息吗？';
-$messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
-$messages['forbiddencharacter'] = '目录名包含隐藏字符。';
+$messages['addingmember'] = '正在添加联系人至群组...';
+$messages['removingmember'] = '正在从群组中删除联系人...';
+$messages['receiptsent'] = '成功发送一个已读回执。';
+$messages['errorsendingreceipt'] = '无法发送已读回执。';
+$messages['deleteidentityconfirm'] = '是否删除该身份？';
+$messages['nodeletelastidentity'] = '无法删除该身份，这是最后一个。';
+$messages['forbiddencharacter'] = '文件夹名包含禁止字符。';
 $messages['selectimportfile'] = '请选择要上传的文件。';
-$messages['addresswriterror'] = '已选择的地址簿不可写。';
-$messages['contactaddedtogroup'] = '成功添加联系人至该分组。';
-$messages['contactremovedfromgroup'] = '成功从该分组移除联系人。';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['addresswriterror'] = '选中的通讯录不可写。';
+$messages['contactaddedtogroup'] = '添加联系人至该群组成功。';
+$messages['contactremovedfromgroup'] = '从该群组移除联系人成功。';
+$messages['nogroupassignmentschanged'] = '群组资料没有变更。';
 $messages['importwait'] = '正在导入，请稍后...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = '导入失败！文件无效。';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人</b>';
 $messages['importconfirmskipped'] = '<b>跳过已存在的 $skipped 项目</b>';
+$messages['importmessagesuccess'] = '成功导入 $nr 条信息';
+$messages['importmessageerror'] = '导入失败！文件无效';
 $messages['opnotpermitted'] = '不允许的操作!';
-$messages['nofromaddress'] = '选中的身份中没有邮件地址。';
-$messages['editorwarning'] = '切换到纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
-$messages['httpreceivedencrypterror'] = '发生了一个致命的配置错误，请立即联系管理员。<b>您的邮件无法发送。</b>';
+$messages['nofromaddress'] = '选中的身份没有邮件地址。';
+$messages['editorwarning'] = '切换至纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
+$messages['httpreceivedencrypterror'] = '<b>您的邮件无法发送</b>，因为发生了一个严重的配置错误，请立即联系管理员。';
 $messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败。';
 $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';
 $messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)。';
@@ -137,17 +140,16 @@ $messages['smtperror'] = 'SMTP 错误: $msg';
 $messages['emailformaterror'] = '无效的邮件地址：$email';
 $messages['toomanyrecipients'] = '收件人太多，请减少人数至 $max。';
 $messages['maxgroupmembersreached'] = '组员数量超过最大值 $max。';
-$messages['internalerror'] = '遇到一个内部错误，请重试。';
 $messages['contactdelerror'] = '无法删除联系人。';
 $messages['contactdeleted'] = '删除联系人成功。';
 $messages['contactrestoreerror'] = '无法恢复已删除的联系人。';
 $messages['contactrestored'] = '联系人恢复成功。';
-$messages['groupdeleted'] = '成功删除组。';
-$messages['grouprenamed'] = '组改名成功。';
-$messages['groupcreated'] = '成功创建组';
+$messages['groupdeleted'] = '删除群组成功。';
+$messages['grouprenamed'] = '群组改名成功。';
+$messages['groupcreated'] = '成功创建群组';
 $messages['savedsearchdeleted'] = '成功删除保存的搜索';
 $messages['savedsearchdeleteerror'] = '无法删除保存的搜索';
-$messages['savedsearchcreated'] = '成功建立保存的搜索';
+$messages['savedsearchcreated'] = '成功创建保存的搜索';
 $messages['savedsearchcreateerror'] = '无法创建保存的搜索。';
 $messages['messagedeleted'] = '删除邮件成功。';
 $messages['messagemoved'] = '移动邮件成功。';
@@ -161,9 +163,8 @@ $messages['folderupdated'] = '成功更新文件夹';
 $messages['foldercreated'] = '成功创建文件夹';
 $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.';
-
+$messages['parentnotwritable'] = '无法创建/转移文件夹至指定的上级文件夹，没有权限。';
+$messages['messagetoobig'] = '邮件过大无法处理。';
+$messages['attachmentvalidationerror'] = '警告！该附件很可疑，因为其自身的格式与邮件中声明的格式不符。如果您不信任发送人，则不应该在浏览器中打开该附件。<br/><br/><em>声明格式：$expected；实际格式：$detected</em>';
+$messages['noscriptwarning'] = '警告：本程序需要 Javascript 支持！请在浏览器设置中启用 Javascript。';
 ?>
diff --git a/program/localization/zh_TW/csv2vcard.inc b/program/localization/zh_TW/csv2vcard.inc
index 9fcacc818..36c5495e1 100644
--- a/program/localization/zh_TW/csv2vcard.inc
+++ b/program/localization/zh_TW/csv2vcard.inc
@@ -15,14 +15,7 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
-// This is a list of CSV column names specified in CSV file header
-// These must be original texts used in Outlook/Thunderbird exported csv files
-// Encoding UTF-8
-
 $map = array();
-
-// MS Outlook 2010
 $map['anniversary'] = "紀念日";
 $map['assistants_name'] = "助理";
 $map['assistants_phone'] = "助理電話";
@@ -69,8 +62,6 @@ $map['spouse'] = "配偶";
 $map['suffix'] = "稱謂";
 $map['title'] = "頭銜";
 $map['web_page'] = "網頁";
-
-// Thunderbird
 $map['last'] = "姓";
 $map['first'] = "名";
 $map['birth_day'] = "生日 (日)";
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 5706ca7b1..4250e5137 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -15,31 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-$labels = array();
-
-// login page
 $labels['welcome']   = '歡迎使用 $product';
 $labels['username']  = '使用者名稱';
 $labels['password']  = '使用者密碼';
 $labels['server']    = '伺服器';
 $labels['login']     = '登入';
-
-// taskbar
 $labels['logout']   = '登出';
 $labels['mail']     = '電子郵件';
 $labels['settings'] = '設定';
 $labels['addressbook'] = '通訊錄';
-
-// mailbox names
 $labels['inbox']  = '收件匣';
 $labels['drafts'] = '草稿匣';
 $labels['sent']   = '寄件備份';
 $labels['trash']  = '垃圾桶';
 $labels['junk']   = '垃圾郵件';
 $labels['show_real_foldernames'] = '顯示特殊資料夾的實際名稱';
-
-// message listing
 $labels['subject'] = '主旨';
 $labels['from']    = '寄件者';
 $labels['sender']  = '寄件者';
@@ -54,13 +44,11 @@ $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['listoptions'] = '列表選項...';
-
 $labels['mailboxlist'] = '資料夾';
 $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']   = '移至...';
@@ -68,13 +56,9 @@ $labels['download'] = '下載';
 $labels['open']     = '開啟';
 $labels['showattachment'] = '顯示';
 $labels['showanyway'] = '總是顯示';
-
 $labels['filename'] = '檔案名稱';
 $labels['filesize'] = '檔案大小';
-
 $labels['addtoaddressbook'] = '新增至通訊錄';
-
-// weekdays short
 $labels['sun'] = '週日';
 $labels['mon'] = '週一';
 $labels['tue'] = '週二';
@@ -82,8 +66,6 @@ $labels['wed'] = '週三';
 $labels['thu'] = '週四';
 $labels['fri'] = '週五';
 $labels['sat'] = '週六';
-
-// weekdays long
 $labels['sunday']    = '星期日';
 $labels['monday']    = '星期一';
 $labels['tuesday']   = '星期二';
@@ -91,8 +73,6 @@ $labels['wednesday'] = '星期三';
 $labels['thursday']  = '星期四';
 $labels['friday']    = '星期五';
 $labels['saturday']  = '星期六';
-
-// months short
 $labels['jan']	= '一';
 $labels['feb']	= '二';
 $labels['mar']	= '三';
@@ -105,8 +85,6 @@ $labels['sep']	= '九';
 $labels['oct']	= '十';
 $labels['nov']	= '十一';
 $labels['dec']	= '十二';
-
-// months long
 $labels['longjan']	= '一月';
 $labels['longfeb']	= '二月';
 $labels['longmar']	= '三月';
@@ -119,10 +97,7 @@ $labels['longsep']	= '九月';
 $labels['longoct']	= '十月';
 $labels['longnov']	= '十一月';
 $labels['longdec']	= '十二月';
-
 $labels['today'] = '今日';
-
-// toolbar buttons
 $labels['refresh']          = '重新整理';
 $labels['checkmail']        = '檢查新郵件';
 $labels['compose']          = '撰寫新郵件';
@@ -155,7 +130,6 @@ $labels['moreactions']      = '更多動作...';
 $labels['more']             = '更多';
 $labels['back']             = '返回';
 $labels['options']          = '選項';
-
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
@@ -174,7 +148,6 @@ $labels['expand-all'] = '全部展開';
 $labels['expand-unread'] = '展開未讀取';
 $labels['collapse-all'] = '全部收起';
 $labels['threaded'] = '郵件串';
-
 $labels['autoexpand_threads'] = '只展開郵件串';
 $labels['do_expand'] = '所有郵件串';
 $labels['expand_only_unread'] = '只展開未讀訊息';
@@ -190,30 +163,23 @@ $labels['listcolumns'] = '列出欄位';
 $labels['listsorting'] = '排序欄位';
 $labels['listorder'] = '排序順序';
 $labels['listmode'] = '清單檢視模式';
-
 $labels['folderactions'] = '資料夾動作...';
 $labels['compact'] = '壓縮';
 $labels['empty'] = '清空';
 $labels['importmessages'] = '匯入郵件';
-
 $labels['quota'] = '磁碟使用量';
 $labels['unknown']  = '未知';
 $labels['unlimited']  = '無限制';
-
 $labels['quicksearch']  = '快速搜尋';
 $labels['resetsearch']  = '重設搜尋';
 $labels['searchmod']  = '修改搜尋';
 $labels['msgtext']  = '整封郵件';
 $labels['body']  = '內文';
-$labels['type'] = 'Type';
 $labels['namex'] = '名稱';
-
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
 $labels['changeformattext'] = '以純文字格式顯示';
 $labels['changeformathtml'] = '以 HTML 格式顯示';
-
-// message compose
 $labels['editasnew']      = '以新郵件編輯';
 $labels['send']           = '寄出';
 $labels['sendmessage']    = '立即寄出';
@@ -225,26 +191,22 @@ $labels['returnreceipt']  = '要求讀取回條';
 $labels['dsn']            = '傳送狀態通知';
 $labels['mailreplyintro'] = '$sender 於 $date 寫到:';
 $labels['originalmessage'] = '原始郵件';
-
 $labels['editidents']    = '編輯身份資訊';
 $labels['spellcheck']    = '拼字';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto']      = '恢復至';
-
 $labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close']  = '關閉';
 $labels['messageoptions']  = '郵件選項...';
-
 $labels['low']     = '低';
 $labels['lowest']  = '最低';
 $labels['normal']  = '普通';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
-
 $labels['nosubject']  = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
@@ -252,25 +214,19 @@ $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'] = '注意：此回條只能確認收件者的電腦顯示了郵件，並不能保證收件者已閱讀或了解郵件的內容。';
-
-// address boook
 $labels['name']         = '顯示名稱';
 $labels['firstname']    = '名稱';
 $labels['surname']      = '姓氏';
@@ -305,7 +261,6 @@ $labels['search'] = '搜尋';
 $labels['advsearch'] = '進階搜尋';
 $labels['advanced'] = '進階設定';
 $labels['other'] = '其他';
-
 $labels['typehome']   = '住家';
 $labels['typework']   = '工作';
 $labels['typeother']  = '其他';
@@ -320,14 +275,12 @@ $labels['typeassistant']  = '助理';
 $labels['typehomepage']  = '首頁';
 $labels['typeblog'] = '部落格';
 $labels['typeprofile'] = '設定檔';
-
 $labels['addfield'] = '新增欄位...';
 $labels['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
 $labels['contacts'] = '聯絡人';
 $labels['contactproperties'] = '聯絡人資訊';
 $labels['personalinfo'] = '個人資訊';
-
 $labels['edit']   = '編輯';
 $labels['cancel'] = '取消';
 $labels['save']   = '儲存';
@@ -336,7 +289,6 @@ $labels['rename'] = '重新命名';
 $labels['addphoto'] = '新增';
 $labels['replacephoto'] = '取代';
 $labels['uploadphoto'] = '上傳相片';
-
 $labels['newcontact']     = '建立新聯絡人資料';
 $labels['deletecontact']  = '刪除所選擇的聯絡人';
 $labels['composeto']      = '寄信至所選擇的聯絡人';
@@ -350,45 +302,33 @@ $labels['newcontactgroup'] = '新增聯絡人群組';
 $labels['grouprename']    = '重新命名群組';
 $labels['groupdelete']    = '刪除群組';
 $labels['groupremoveselected'] = '從群組中刪除選擇的聯絡人';
-
 $labels['previouspage']   = '顯示上一頁';
 $labels['firstpage']      = '顯示第一頁';
 $labels['nextpage']       = '顯示下一頁';
 $labels['lastpage']       = '顯示最後一頁';
-
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = '個人通訊錄';
-
 $labels['searchsave'] = '儲存搜尋結果';
 $labels['searchdelete'] = '刪除搜尋結果';
-
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
-$labels['importgroups'] = 'Import group assignments';
 $labels['importgroupsall'] = '全部(如有必要,新增群組)';
 $labels['importgroupsexisting'] = '僅限於既有群組';
 $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 郵件';
@@ -480,11 +420,9 @@ $labels['spellcheckignorenums'] = '忽略數字';
 $labels['spellcheckignorecaps'] = '忽略大寫字母';
 $labels['addtodict'] = '加入詞典';
 $labels['mailtoprotohandler'] = '註冊mailto:協定處理程式';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = '郵件轉寄方式';
 $labels['inline'] = '放入內文';
 $labels['asattachment'] = '當成附件';
-
 $labels['folder']  = '資料夾';
 $labels['folders']  = '資料夾';
 $labels['foldername']  = '資料夾名稱';
@@ -505,26 +443,20 @@ $labels['foldertype'] = '資料夾類型';
 $labels['personalfolder']  = '私人資料夾';
 $labels['otherfolder']  = '其他使用者資料夾';
 $labels['sharedfolder']  = '公用資料夾';
-
 $labels['sortby'] = '排序';
 $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'] = '西歐語系';
@@ -543,5 +475,4 @@ $labels['vietnamese'] = '越南';
 $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
-
 ?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index b6fdcccae..c52116a55 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages = array();
 $messages['errortitle']  = '發生錯誤！';
 $messages['loginfailed']  = '登入失敗';
 $messages['cookiesdisabled'] = '你的瀏覽器不接受 cookies';
@@ -44,7 +42,7 @@ $messages['checkingmail'] = '檢查新郵件...';
 $messages['sendingmessage'] = '寄出郵件中...';
 $messages['messagesent'] = '郵件寄出成功';
 $messages['savingmessage'] = '儲存郵件中...';
-$messages['messagesaved'] = '訊息已經存至';
+$messages['messagesaved'] = '郵件已經儲存至草稿匣';
 $messages['successfullysaved'] = '儲存成功';
 $messages['addedsuccessfully'] = '聯絡人已經成功地新增至通訊錄';
 $messages['contactexists'] = '此聯絡人的電子郵件位址已存在';
@@ -56,8 +54,6 @@ $messages['contactnotfound'] = '找不到要求的聯絡人';
 $messages['contactsearchonly'] = '輸入關鍵字找尋連絡人';
 $messages['sendingfailed'] = '郵件寄出失敗';
 $messages['senttooquickly'] = '你寄出的郵件太過於頻繁，請稍候 $sec 秒後再試一次。';
-$messages['errorsavingsent'] = '儲存寄件備份時發生錯誤';
-$messages['errorsaving'] = '儲存時發生錯誤';
 $messages['errormoving'] = '無法移動此郵件';
 $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
@@ -101,16 +97,16 @@ $messages['converting'] = '移除郵件格式中...';
 $messages['messageopenerror'] = '無法從伺服器載入郵件';
 $messages['fileuploaderror'] = '檔案上傳失敗';
 $messages['filesizeerror'] = '上傳的檔案超過了 $size 的大小限制';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = '成功複製 $nr 個聯絡人。';
+$messages['movesuccess'] = '成功移動 $nr 個聯絡人。';
+$messages['copyerror'] = '無法複製任何聯絡人。';
+$messages['moveerror'] = '無法移動任何聯絡人。';
 $messages['sourceisreadonly'] = '此來源位址是唯讀的';
 $messages['errorsavingcontact'] = '無法儲存連絡人的位址';
 $messages['movingmessage'] = '移動郵件中...';
 $messages['copyingmessage'] = '複製訊息...';
 $messages['copyingcontact'] = '複製群組...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = '正在移動連絡人...';
 $messages['deletingmessage'] = '刪除訊息...';
 $messages['markingmessage'] = '標示訊息...';
 $messages['addingmember'] = '新增連絡人至群組';
@@ -129,8 +125,8 @@ $messages['importwait'] = '匯入中，請稍候...';
 $messages['importformaterror'] = '匯入失敗！上載的檔案格式不支援';
 $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料，略過 $skipped 筆已存在的資料</b>：<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>略過 $skipped 個已存在的項目</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = '成功匯入 $nr 封郵件';
+$messages['importmessageerror'] = '匯入失敗！上載的檔案不是有效的郵件或資料夾檔案';
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
 $messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
@@ -144,7 +140,6 @@ $messages['smtperror'] = 'SMTP 錯誤：$msg';
 $messages['emailformaterror'] = '錯誤電子郵件：$email';
 $messages['toomanyrecipients'] = '太多收件人。請減少至 $max 人';
 $messages['maxgroupmembersreached'] = '太多群組成員，超過最大人數 $max 人';
-$messages['internalerror'] = '內部發生錯誤。請再次嘗試';
 $messages['contactdelerror'] = '無法刪除聯絡人';
 $messages['contactdeleted'] = '聯絡人成功刪除';
 $messages['contactrestoreerror'] = '無法復原刪除的連絡人';
@@ -173,5 +168,4 @@ $messages['messagetoobig'] = '郵件太大無法處理';
 $messages['attachmentvalidationerror'] = '警告！這個附件是可疑的，因為它的檔案類型與其宣稱的不同。如果您不能相信寄件者請不要開啟附件，它可能含有惡意的內容。<br /><br />
 <em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = '警告：使用Webmail需要Javascript支援，請檢查您瀏覽器的Javascript設定';
-
 ?>