Updated localization files from launchpad

95 files changed, 673 insertions, 450 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 99b8fc2e5..0fe7214d6 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
+ | Author: Fifawe <hany.samir@gmail.com>                                 |
  +-----------------------------------------------------------------------+
 */
 
@@ -91,13 +91,16 @@ $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'] = 'تمرير الرسالة';
@@ -110,12 +113,16 @@ $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'] = 'لاشيء';
@@ -125,6 +132,7 @@ $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
 $labels['deleted'] = 'محذوف';
+$labels['undeleted'] = 'غير محذوفة';
 $labels['invert'] = 'عكس';
 $labels['filter'] = 'تصفية';
 $labels['list'] = 'قائمة';
@@ -160,8 +168,9 @@ $labels['msgtext'] = 'كامل الرسالة';
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
 $labels['editasnew'] = 'تعديل كجديد';
-$labels['savemessage'] = 'حفظ هذه المسودة';
+$labels['send'] = 'ارسل';
 $labels['sendmessage'] = 'إرسال الرسالة الآن';
+$labels['savemessage'] = 'حفظ هذه المسودة';
 $labels['addattachment'] = 'إرفاق ملف';
 $labels['charset'] = 'مجموعة المحارف';
 $labels['editortype'] = 'نوع المُحرّر';
@@ -170,9 +179,11 @@ $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)';
@@ -187,6 +198,7 @@ $labels['nosubject'] = '(دون موضوع)';
 $labels['showimages'] = 'إظهار الصور';
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
 $labels['isdraft'] = 'هذه مسودّة رسالة';
+$labels['andnmore'] = '$nr المزيد ...';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'نص مجرد';
 $labels['savesentmessagein'] = 'احفظ الرسالة المُرسلة في';
@@ -233,6 +245,7 @@ $labels['spouse'] = 'زوجة';
 $labels['allfields'] = 'جميع الحقول';
 $labels['search'] = 'بحث';
 $labels['advsearch'] = 'بحث متقدم';
+$labels['advanced'] = 'مُتقدم';
 $labels['other'] = 'آخر';
 $labels['typeother'] = 'آخر';
 $labels['typehome'] = 'المنزل';
@@ -260,6 +273,7 @@ $labels['delete'] = 'حذف';
 $labels['rename'] = 'إعادة التسمية';
 $labels['addphoto'] = 'إضافة';
 $labels['replacephoto'] = 'استبدال';
+$labels['uploadphoto'] = 'ارفع صورة';
 $labels['newcontact'] = 'إنشاء بطاقة مراسل جديدة';
 $labels['deletecontact'] = 'حذف المراسلين المحددين';
 $labels['composeto'] = 'إنشاء رسالة إليه';
@@ -270,6 +284,7 @@ $labels['exportvcards'] = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
 $labels['grouprename'] = 'تغيير اسم المجموعة';
 $labels['groupdelete'] = 'حذف المجموعة';
+$labels['groupremoveselected'] = 'حذف العنوان المختار من المجموعة';
 $labels['previouspage'] = 'عرض المجموعة السابقة';
 $labels['firstpage'] = 'عرض المجموعة الأولى';
 $labels['nextpage'] = 'عرض المجموعة التالية';
@@ -284,7 +299,6 @@ $labels['importcontacts'] = 'استورد المراسلين';
 $labels['importfromfile'] = 'استورد من ملف:';
 $labels['importtarget'] = 'أضف المراسلين الجدد إلى دفتر العناوين:';
 $labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
-$labels['importtext'] = 'يمكنك رفع قائمة المراسلين من دفتر عناوين موجود.<br/>ندعم حالياً استيراد العناوين من نسق بيانات <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'تم';
 $labels['settingsfor'] = 'إعدادات';
 $labels['about'] = 'نبذة';
@@ -309,6 +323,8 @@ $labels['timezone'] = 'المنطقة الزمنية';
 $labels['pagesize'] = 'عدد الرسائل في الصفحة';
 $labels['signature'] = 'التوقيع';
 $labels['dstactive'] = 'التوقيت الصيفي';
+$labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
+$labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
 $labels['htmlsignature'] = 'توقيع HTML';
@@ -322,20 +338,19 @@ $labels['mailboxview'] = 'مظهر صندوق البريد';
 $labels['mdnrequests'] = 'عند طلب إشعار استلام';
 $labels['askuser'] = 'اسأل المستخدم';
 $labels['autosend'] = 'أرسلها تلقائياً';
-$labels['autosendknown'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلا اسألني';
-$labels['autosendknownignore'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلا تجاهل الأمر';
+$labels['autosendknown'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلااسألني';
+$labels['autosendknownignore'] = 'أرسل إشعار استلام إلى جهات اتصالي، وإلاتجاهل الأمر';
 $labels['ignore'] = 'تجاهلها';
 $labels['readwhendeleted'] = 'تحديد الرسالة كمقروءة عند حذفها';
-$labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً من حذفها';
+$labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
-$labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلى المهملات';
+$labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
 $labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
 $labels['fromknownsenders'] = 'للمرسلين المعلومين';
 $labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
 $labels['autosavedraft'] = 'حفظ المسودة تلقائياً';
 $labels['everynminutes'] = 'كل $n دقيقة';
-$labels['keepalive'] = 'التحقق من وجود رسائل جديدة عند';
 $labels['never'] = 'أبداً';
 $labels['immediately'] = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
@@ -344,11 +359,11 @@ $labels['mimeparamfolding'] = 'أسماء الملفات المرفقة';
 $labels['2231folding'] = 'RFC 2231 بأكملها (ثندربيرد)';
 $labels['miscfolding'] = 'RFC 2047/2231 (ميكروسوفت آوتلوك)';
 $labels['2047folding'] = 'RFC 2047 بأكملها (غيرها)';
-$labels['force7bit'] = 'استخدام ترميز MIME للحروف ذات الثمانية بتّات';
+$labels['force7bit'] = 'استخدام ترميز MIME للحروف ذات الثمانيةبتّات';
 $labels['advancedoptions'] = 'خيارات متقدّمة';
-$labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالة جديدة';
-$labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميع المجلدات';
-$labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقل الرسالة الحالية';
+$labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
+$labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
+$labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
 $labels['mainoptions'] = 'الخيارات الأساسية';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
@@ -369,9 +384,9 @@ $labels['previewpanemarkread'] = 'تحديد الرسائل المُعاينة �
 $labels['afternseconds'] = 'بعد $n ثواني';
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
-$labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالة المردود عليها';
-$labels['defaultaddressbook'] = 'أضف المراسلين الجديد إلى دفتر العناوين المحدد';
-$labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل في التكملة التلقائية';
+$labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
+$labels['defaultaddressbook'] = 'أضف المراسلين الجديد إلى دفتر العناوينالمحدد';
+$labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
 $labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
 $labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
 $labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 390c30f61..b1e25b88d 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -16,7 +16,7 @@
 $messages = array();
 $messages['loginfailed'] = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
-$messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غير صالحة';
+$messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
 $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
@@ -37,14 +37,14 @@ $messages['messagesent'] = 'تم إرسال الرسالة بنجاح';
 $messages['savingmessage'] = 'حفظ الرسالة...';
 $messages['messagesaved'] = 'تم حفظ الرسالة في المسودات';
 $messages['successfullysaved'] = 'تم الحفظ بنجاح';
-$messages['addedsuccessfully'] = 'تمت إضافة المراسل إلى دفتر العناوين بنجاح';
-$messages['contactexists'] = 'هناك مراسل له نفس هذا البريد الالكتروني موجود مسبقاً';
+$messages['addedsuccessfully'] = 'تمت إضافة المراسل إلى دفتر العناوينبنجاح';
+$messages['contactexists'] = 'هناك مراسل له نفس هذا البريد الالكترونيموجود مسبقاً';
 $messages['contactnameexists'] = 'هناك مُرسال له نفس الإسم موجود مسبقاً.';
-$messages['blockedimages'] = 'لحماية خصوصيتك، تم حجب الصور الغير مضمنة (البعيدة) في هذه الرسالة.';
+$messages['blockedimages'] = 'لحماية خصوصيتك، تم حجب الصور الغير مضمنة(البعيدة) في هذه الرسالة.';
 $messages['encryptedmessage'] = 'هذه الرسالة مشفرة ولا يمكن عرضها. عذراً!';
 $messages['nocontactsfound'] = 'لم يعثر على أي مراسل';
 $messages['contactnotfound'] = 'تعذر العثور على المراسل المطلوب';
-$messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور على المُراسلين';
+$messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور علىالمُراسلين';
 $messages['sendingfailed'] = 'فشل إرسال الرسالة';
 $messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسال هذه الرسالة';
 $messages['errorsavingsent'] = 'حدث خطأ أثناء حفظ الرسالة المُرسلة';
@@ -57,7 +57,7 @@ $messages['deletecontactconfirm'] = 'هل تريد حقاً حذف المراس�
 $messages['deletegroupconfirm'] = 'هل تريد فعلاً حذف المجموعة المحددة؟';
 $messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
 $messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
-$messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذا المجلد؟';
+$messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذاالمجلد؟';
 $messages['contactdeleting'] = 'جاري حذف المُراسلين...';
 $messages['groupdeleting'] = 'جاري حذف المجموعة...';
 $messages['folderdeleting'] = 'جاري حذف المجلد...';
@@ -68,13 +68,13 @@ $messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستم�
 $messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
 $messages['nonamewarning'] = 'الرجاء إدخال اسم';
 $messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
-$messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكتروني للمُرسل';
+$messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكترونيللمُرسل';
 $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
-$messages['nosubjectwarning'] = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوع للرسالة؟';
+$messages['nosubjectwarning'] = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
-$messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهل الرسالة؟';
+$messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهلالرسالة؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
-$messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريد إلكتروني';
+$messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريدإلكتروني';
 $messages['notuploadedwarning'] = 'لم يتم رفع جميع المرفقات بعد. رجاءً الانتظار أو إلغاء عملية الرفع.';
 $messages['searchsuccessful'] = 'عثر على $nr رسائل';
 $messages['contactsearchsuccessful'] = 'عُثر على $nr مُراسَل';
@@ -91,7 +91,7 @@ $messages['deletedsuccessfully'] = 'تم الحذف بنجاح';
 $messages['converting'] = 'إزالة التنسيق من الرسالة...';
 $messages['messageopenerror'] = 'تعذرت قراءة الرسالة من الخادم';
 $messages['fileuploaderror'] = 'فشل رفع الملف';
-$messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجم الأقصى $size';
+$messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجمالأقصى $size';
 $messages['copysuccess'] = 'تم نسخ $nr رسائل بنجاح';
 $messages['copyerror'] = 'لم يمكن نسخ أية عناوين';
 $messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
@@ -105,18 +105,17 @@ $messages['addingmember'] = 'جاري إضافة المُراسلين إلى ا�
 $messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
-$messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيد المتبقي.';
+$messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
-$messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعة بنجاح';
-$messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعة بنجاح';
+$messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
+$messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
-$messages['importerror'] = 'فشل الاستيراد! الملف المرفوع ليس ملف vCard صالح.';
-$messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل $skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
-$messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد في الهويّة المنتقاة';
+$messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد فيالهويّة المنتقاة';
 $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
 $messages['httpreceivedencrypterror'] = 'حدث خطأ جسيم في التهيئة. رجاءً اتصال بمدير الخادم حالاً. <b>لا يمكن إرسال بريدك.</b>';
 $messages['smtpconnerror'] = 'خطأ SMTP ($code): تعذر الاتصال بالخادم';
@@ -144,14 +143,14 @@ $messages['messagedeleted'] = 'تم حذف الرسائل بنجاح';
 $messages['messagemoved'] = 'تم نقل الرسائل بنجاح';
 $messages['messagecopied'] = 'تم نسخ الرسائل بنجاح';
 $messages['messagemarked'] = 'تم تحديد الرسائل بنجاح';
-$messages['autocompletechars'] = 'إكتب $min أحرف على الأقل للحصول على التكملة التلقائية';
-$messages['autocompletemore'] = 'هناك المزيد من النتائج المطابقة. رجاء اكتب كلمات بحث أكثر.';
+$messages['autocompletechars'] = 'إكتب $min أحرف على الأقل للحصول على التكملةالتلقائية';
+$messages['autocompletemore'] = 'هناك المزيد من النتائج المطابقة. رجاءاكتب كلمات بحث أكثر.';
 $messages['namecannotbeempty'] = 'لا يمكن ترك الإسم فارغاً';
 $messages['nametoolong'] = 'الإسم طويل جداً';
 $messages['folderupdated'] = 'تم تحديث المجلد بنجاح';
 $messages['foldercreated'] = 'تم إنشاء المجلد بنجاح';
 $messages['invalidimageformat'] = 'ليست صيغة صورة صحيحة';
 $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
-$messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد. ليست لديك الصلاحية.';
+$messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
 
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index ac2c577ac..15d1bb56c 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emin Mastizadeh <emin25@ovi.com>                              |
+ | Author: Orkhan Guliyev <proger@box.az>                                |
  +-----------------------------------------------------------------------+
 */
 
@@ -40,11 +40,13 @@ $labels['size'] = 'Ölçü';
 $labels['priority'] = 'Vaciblik';
 $labels['organization'] = 'Təşkilat';
 $labels['readstatus'] = 'Statusu oxu';
+$labels['listoptions'] = 'Siyahı ayarları...';
 $labels['mailboxlist'] = 'Qovluqlar';
 $labels['folders'] = 'Qovluqlar';
 $labels['messagesfromto'] = '$count mesajdan $from - $to arası mesajlar';
 $labels['threadsfromto'] = 'Müzakirə: $from - $to Toplam: $count';
 $labels['messagenrof'] = 'Məktub: $nr / $count';
+$labels['fromtoshort'] = '$from – $to-dan $count';
 $labels['copy'] = 'Kopyala';
 $labels['move'] = 'Köçür';
 $labels['moveto'] = 'Burada köçür...';
@@ -91,13 +93,18 @@ $labels['longoct'] = 'Oktyabr';
 $labels['longnov'] = 'Noyabr';
 $labels['longdec'] = 'Dekabr';
 $labels['today'] = 'Bu gün';
+$labels['refresh'] = 'Yenilə';
 $labels['checkmail'] = 'Gələnləri yoxla';
 $labels['compose'] = 'Məktub yaz';
 $labels['writenewmessage'] = 'Yeni məktub';
+$labels['reply'] = 'Cavabla';
 $labels['replytomessage'] = 'Göndərənə cavabla';
 $labels['replytoallmessage'] = 'Hamıya cavabla';
 $labels['replyall'] = 'Hamıya cavab';
 $labels['replylist'] = 'Cavab siyahısı';
+$labels['forward'] = 'Ötür';
+$labels['forwardinline'] = 'Məktubda ötür';
+$labels['forwardattachment'] = 'Əlavə kimi ötür';
 $labels['forwardmessage'] = 'Yönəlt';
 $labels['deletemessage'] = 'Sil';
 $labels['movemessagetotrash'] = 'Məktubu səbətə köçür';
@@ -108,11 +115,16 @@ $labels['nextmessage'] = 'Sonrakı məktubu göstər';
 $labels['lastmessage'] = 'Sonuncu məktubu göstər';
 $labels['backtolist'] = 'Məktublar siyahısına qayıt';
 $labels['viewsource'] = 'Mənbəni göstər';
+$labels['mark'] = 'İşarələ';
 $labels['markmessages'] = 'Məktubları işarələ';
 $labels['markread'] = 'Oxunmuş';
 $labels['markunread'] = 'Oxunmamış';
 $labels['markflagged'] = 'Qeyd et';
 $labels['markunflagged'] = 'Qeydi çıxar';
+$labels['moreactions'] = 'Daha çox seçim...';
+$labels['more'] = 'Daha çox';
+$labels['back'] = 'Geri';
+$labels['options'] = 'Ayarlar';
 $labels['select'] = 'Seçin';
 $labels['all'] = 'Hamısı';
 $labels['none'] = 'Heç biri';
@@ -122,6 +134,7 @@ $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
 $labels['unanswered'] = 'Cavabsızları';
 $labels['deleted'] = 'Silinmişləri';
+$labels['undeleted'] = 'Silinməyib';
 $labels['invert'] = 'İnvertliləri';
 $labels['filter'] = 'Süzgəc';
 $labels['list'] = 'Siyahı';
@@ -157,17 +170,22 @@ $labels['msgtext'] = 'Bütün məktub';
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
 $labels['editasnew'] = 'Yeni kimi redaktə et';
-$labels['savemessage'] = 'Qaralama saxla';
+$labels['send'] = 'Göndər';
 $labels['sendmessage'] = 'İndi göndər';
+$labels['savemessage'] = 'Qaralama saxla';
 $labels['addattachment'] = 'Fayl əlavə et';
 $labels['charset'] = 'Kodlaşdırma';
 $labels['editortype'] = 'Redaktor';
 $labels['returnreceipt'] = 'Cavab sorğusu';
 $labels['dsn'] = 'Çatdırılma statusu haqda bildiriş';
+$labels['mailreplyintro'] = '$date tarixdə, $sender yazıb:';
+$labels['originalmessage'] = 'Orijinal məktub';
 $labels['editidents'] = 'İdentifikasiyanı dəyiş';
+$labels['spellcheck'] = 'Orfoqrafiya';
 $labels['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)';
@@ -181,6 +199,10 @@ $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';
+$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...';
@@ -224,6 +246,10 @@ $labels['manager'] = 'Menecer';
 $labels['assistant'] = 'Köməkçi';
 $labels['typeassistant'] = 'Köməkçi';
 $labels['spouse'] = 'Ər-arvad';
+$labels['allfields'] = 'Bütün sahələr';
+$labels['search'] = 'Axtar';
+$labels['advsearch'] = 'Ətraflı axtarış';
+$labels['advanced'] = 'Əlavə';
 $labels['other'] = 'Başqa';
 $labels['typeother'] = 'Başqa';
 $labels['typehome'] = 'Ev';
@@ -235,6 +261,9 @@ $labels['typeworkfax'] = 'İş faksı';
 $labels['typecar'] = 'Maşın';
 $labels['typepager'] = 'Peycer';
 $labels['typevideo'] = 'Video';
+$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';
@@ -248,6 +277,7 @@ $labels['delete'] = 'Sil';
 $labels['rename'] = 'Adlandır';
 $labels['addphoto'] = 'Əlavə et';
 $labels['replacephoto'] = 'Adı dəyiş';
+$labels['uploadphoto'] = 'Şəkil yüklə';
 $labels['newcontact'] = 'Yeni ünvan kartı əlavə et';
 $labels['deletecontact'] = 'Seçilmiş ünvanları sil';
 $labels['composeto'] = 'Seçilmiş ünvanlara məktub yaz';
@@ -256,6 +286,9 @@ $labels['print'] = 'Çap et';
 $labels['export'] = 'İxrac et';
 $labels['exportvcards'] = 'Ünvanları vCards formatında ixrac et';
 $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
+$labels['grouprename'] = 'Qruğun adını dəyişdir';
+$labels['groupdelete'] = 'Qrupu sil';
+$labels['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';
@@ -263,13 +296,16 @@ $labels['lastpage'] = 'Sonuncunu göstər';
 $labels['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
 $labels['personaladrbook'] = 'Şəxsi ünvanlar';
+$labels['searchsave'] = 'Sorğunu saxla';
+$labels['searchdelete'] = 'Sorğunu sil';
 $labels['import'] = 'İdxal';
 $labels['importcontacts'] = 'Ünvanların idxalı';
 $labels['importfromfile'] = 'Fayldan idxal:';
+$labels['importtarget'] = 'Əlaqə kitabçasına yeni kontaktları əlavə et';
 $labels['importreplace'] = 'Ünvan kitabçasını dəyiş';
-$labels['importtext'] = 'Siz ünvanları mövcud ünvan kitabçasından yükləyə bilərsiniz. Hal-hazırda ünvanların idxalını <a href="http://az.wikipedia.org/wiki/vCard">vCard</a> formatında dəstəkləyirik.';
 $labels['done'] = 'Bitdi';
 $labels['settingsfor'] = 'Nizamlamaları';
+$labels['about'] = 'Haqqında';
 $labels['preferences'] = 'Nizamlamalar';
 $labels['userpreferences'] = 'İstifadəçi nizamlamaları';
 $labels['editpreferences'] = 'İstifadəçi nizamlamalarını redaktə et';
@@ -281,6 +317,8 @@ $labels['edititem'] = 'Maddəni redaktə et';
 $labels['preferhtml'] = 'HTML-də göstər';
 $labels['defaultcharset'] = 'İlkin vəziyyətdəki kodlaşdırma';
 $labels['htmlmessage'] = 'HTML məktub';
+$labels['dateformat'] = 'Tarix formatı';
+$labels['timeformat'] = 'Vaxt formatı';
 $labels['prettydate'] = 'Qəşəng tarixlər';
 $labels['setdefault'] = 'İlkin vəziyyətə qaytar';
 $labels['autodetect'] = 'Avto';
@@ -289,8 +327,11 @@ $labels['timezone'] = 'Saat qurşağı';
 $labels['pagesize'] = 'Səhifədə sətrlər';
 $labels['signature'] = 'İmza';
 $labels['dstactive'] = 'Yay vaxtı';
+$labels['showinextwin'] = 'Məktubu yeni pəncərədə aç';
+$labels['composeextwin'] = 'Yeni pəncərədə yarat';
 $labels['htmleditor'] = 'HTML-də mesaj yaz';
 $labels['htmlonreply'] = 'yalnız HTML mesajlar ilə cavab';
+$labels['htmlonreplyandforward'] = 'HTML məktuba cavab və yönəltmə zamanı';
 $labels['htmlsignature'] = 'HTML imza';
 $labels['previewpane'] = 'Prevyu paneli göstər';
 $labels['skin'] = 'İnterfeys stili';
@@ -309,13 +350,13 @@ $labels['readwhendeleted'] = 'Məktubu siləndə oxunmuş kimi qeyd et';
 $labels['flagfordeletion'] = 'Silmə əvəzi silinmə işarəsilə qeyd et';
 $labels['skipdeleted'] = 'Silinmiş məktubları göstərmə';
 $labels['deletealways'] = 'Məktubu səbətə köçürmək alınmırsa, silinsin';
+$labels['deletejunk'] = 'SPAM-dakı məktubları səbətə yollamadan sil';
 $labels['showremoteimages'] = 'Silinmiç şəkilləri göstər';
 $labels['fromknownsenders'] = 'məlum göndərənlərdən';
 $labels['always'] = 'hər zaman';
 $labels['showinlineimages'] = 'Əlavə olunmuş şəkili məktubun aşağısında göstər';
 $labels['autosavedraft'] = 'Qaralamanı avtomatik saxla';
 $labels['everynminutes'] = 'hər $n dəqiqə(lər)';
-$labels['keepalive'] = 'Yeni məktubları yoxla';
 $labels['never'] = 'heç vaxt';
 $labels['immediately'] = 'dərhal';
 $labels['messagesdisplaying'] = 'Məktubların göstərilməsi';
@@ -329,12 +370,15 @@ $labels['advancedoptions'] = 'Ətraflı nizamlama';
 $labels['focusonnewmessage'] = 'Yeni məktub zamanı brauzerin pəncərəsini fokusla';
 $labels['checkallfolders'] = 'Bütün qovluqlarda yeni məktubları yoxla';
 $labels['displaynext'] = 'Hazırkini sildikdə/köçürdükdə növbəti məktubu göstər';
+$labels['defaultfont'] = 'HTML məktubun default şrifti';
 $labels['mainoptions'] = 'Əsas nizamlamalar';
+$labels['browseroptions'] = 'Brauzer ayarları';
 $labels['section'] = 'Bölmə';
 $labels['maintenance'] = 'Xidmət';
 $labels['newmessage'] = 'Yeni məktub';
 $labels['signatureoptions'] = 'İmzanın nizamlamaları';
 $labels['whenreplying'] = 'Cavab zamanı';
+$labels['replyempty'] = 'orijinal məktubu sitat gətirmə';
 $labels['replytopposting'] = 'orijinaldan əvvəl yeni məktub yaz';
 $labels['replybottomposting'] = 'orijinaldan sonra yeni məktub yaz';
 $labels['replyremovesignature'] = 'Cavab zamanı imzanı sil';
@@ -350,6 +394,19 @@ $labels['afternseconds'] = '$n saniyədən sonra';
 $labels['reqmdn'] = 'Hər zaman çatdırılma bildirişini istə';
 $labels['reqdsn'] = 'Hər zaman çatıdrılma haqda statusu istə';
 $labels['replysamefolder'] = 'Cavab mesajları üçün saxlanılan yer';
+$labels['defaultaddressbook'] = 'Yeni konktaktları seçilmiş ünvan kitabçasına əlavə et';
+$labels['autocompletesingle'] = 'Avtobitmədə əlavə ünvanları burax';
+$labels['listnamedisplay'] = 'Kontaklar siyahısı bu cür göstər';
+$labels['spellcheckbeforesend'] = 'Göndərməzdən əvvəl orfoqrafiyanı yoxla';
+$labels['spellcheckoptions'] = 'Orfoqrafiya yoxlanışının ayarları';
+$labels['spellcheckignoresyms'] = 'Simvollar ilə sözləri burax';
+$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['forwardmode'] = 'Məktubların yönəldilməsi';
+$labels['inline'] = 'mətndə';
+$labels['asattachment'] = 'fayl kimi';
 $labels['folder'] = 'Qovluq';
 $labels['foldername'] = 'Qovluq adı';
 $labels['subscribed'] = 'İmzalanıb';
@@ -372,6 +429,13 @@ $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';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 4818cf715..10c885bc5 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -9,26 +9,30 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Orkhan Guliyev <proger@box.az>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Xəta baş verib!';
 $messages['loginfailed'] = 'Giriş uğursuz oldu';
 $messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir';
 $messages['sessionerror'] = 'Sizin sessiya köhnəlib';
 $messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı';
 $messages['servererror'] = 'Server xətası!';
 $messages['servererrormsg'] = 'Server xətası: $msg';
+$messages['dberror'] = 'Məlumatlar bazasında xəta!';
+$messages['requesttimedout'] = 'Sorğunun gözləmə müddəti bitdi';
 $messages['errorreadonly'] = 'Əməliyyatı etmək mümkün deyil. Qovluq yalnız oxunuş üçündür.';
 $messages['errornoperm'] = 'Əməliyyatı etmək mümkün deyil. Giriş qadağandır.';
 $messages['invalidrequest'] = 'Səhv sorğu! Məlumat yaddaşda qalmadı.';
+$messages['invalidhost'] = 'Səhv server adı';
 $messages['nomessagesfound'] = 'Poçt qutusunda məktub tapılmadı';
 $messages['loggedout'] = 'Çıxış uğurlu oldu. Sağ olun!';
 $messages['mailboxempty'] = 'Poçt qutusu boşdur';
 $messages['loading'] = 'Yüklənir...';
 $messages['uploading'] = 'Fayl yüklənir...';
+$messages['uploadingmany'] = 'Fayllar yüklənir...';
 $messages['loadingdata'] = 'Məlumatlar yüklənir...';
 $messages['checkingmail'] = 'Yeni məktubları yoxla...';
 $messages['sendingmessage'] = 'Məktub göndərilir...';
@@ -38,10 +42,12 @@ $messages['messagesaved'] = 'Məktub qaralamada saxlandı';
 $messages['successfullysaved'] = 'Yaddaşa yazıldı';
 $messages['addedsuccessfully'] = 'Əlaqə ünvan kitabçasına əlavə olundu';
 $messages['contactexists'] = 'Ünvan kitabçasında bu e-poçtla əlaqə mövcuddur';
+$messages['contactnameexists'] = 'Bu adda kontakt artıq mövcuddur.';
 $messages['blockedimages'] = 'Təhlükəsizlik məqsədi ilə şəkillərin yüklənməsi bloklanıb.';
 $messages['encryptedmessage'] = 'Məktub şifrələnib və göstərilə bilməz. Server inzibatçısına müraciət edin.';
 $messages['nocontactsfound'] = 'Ünvanlar tapılmadı';
 $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';
@@ -51,9 +57,12 @@ $messages['errorcopying'] = 'Məktubu (məktubları) kopyalamaq alınmadı';
 $messages['errordeleting'] = 'Məktubu (məktubları) silmək alınmadı';
 $messages['errormarking'] = 'Məktubu (məktubları) işarələmək mümkün deyil';
 $messages['deletecontactconfirm'] = 'Seçilən ünvanı (ünvanları) silməyə əminsiniz?';
+$messages['deletegroupconfirm'] = 'Qrupu silməkdə əminsiniz?';
 $messages['deletemessagesconfirm'] = 'Seçilən məktubu (məktubları) silməyə əminsiniz?';
 $messages['deletefolderconfirm'] = 'Bu qovluğu silməyə əminsiniz?';
 $messages['purgefolderconfirm'] = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
+$messages['contactdeleting'] = 'Kontak(lar)ın silinməsi...';
+$messages['groupdeleting'] = 'Qrupun silinməsi...';
 $messages['folderdeleting'] = 'Qovluğ silinir...';
 $messages['foldermoving'] = 'Qovluq köçürülür...';
 $messages['foldersubscribing'] = 'Qovluğa abunə...';
@@ -71,6 +80,7 @@ $messages['noldapserver'] = 'Lütfən, axtarış üçün LDAP server seçin';
 $messages['nosearchname'] = 'Lütfən, ad və ya e-poçt əlavə edin';
 $messages['notuploadedwarning'] = 'Əlavələr tam yüklənilməyib. Gözləyin və ya yükləməni ləğv edin.';
 $messages['searchsuccessful'] = 'Tapılan məktublar: $nr';
+$messages['contactsearchsuccessful'] = '$nr kontakt tapılıb.';
 $messages['searchnomatch'] = 'Məktub tapılmadı';
 $messages['searching'] = 'Axtarılır...';
 $messages['checking'] = 'Yoxlanılır...';
@@ -91,18 +101,22 @@ $messages['sourceisreadonly'] = 'Verilən ünvanlar mənbəyi yalnız oxunmaq ü
 $messages['errorsavingcontact'] = 'Əlaqəni ünvanda saxlamaq mümkün deyil';
 $messages['movingmessage'] = 'Məktub köçürülür...';
 $messages['copyingmessage'] = 'Məktub kopyalanır...';
+$messages['copyingcontact'] = 'Kontakt(lar)ın kopyalanması...';
 $messages['deletingmessage'] = 'Məktub(lar) silinir...';
 $messages['markingmessage'] = 'Məktub(lar) işarələnir...';
+$messages['addingmember'] = 'Kontakt(lar)ın qrupa əlavə edilməsi...';
+$messages['removingmember'] = 'Kontakt(lar)ın qrupdan silinməsi...';
 $messages['receiptsent'] = 'Oxunulma haqda bildiriş göndərildi';
 $messages['errorsendingreceipt'] = 'Oxunulma haqda bildiriş göndərilmədi';
+$messages['deleteidentityconfirm'] = 'İdentifikasiyanı silməkdə əminsiniz?';
 $messages['nodeletelastidentity'] = 'Siz bu kimliyi silə bilməzsiniz. Bu axırıncıdır.';
 $messages['forbiddencharacter'] = 'Qovlu adı qadağan olunmuş simvollar təşkil edir';
 $messages['selectimportfile'] = 'Yüklənilən faylı seçin';
 $messages['addresswriterror'] = 'Seçilmiş ünvan kitabçası yaddaşa yazıla bilməz';
 $messages['contactaddedtogroup'] = 'Ünvanlar qrupa əlavə edildi';
 $messages['contactremovedfromgroup'] = 'Ünvanlar qrupdan silindi';
+$messages['nogroupassignmentschanged'] = 'Qruplar arası bölgü dəyişməyib.';
 $messages['importwait'] = 'İdxal gedir, lütfən gözləyin...';
-$messages['importerror'] = 'İdxal alınmadı! Yüklənilən fayl düzgün vCard fayl deyil.';
 $messages['importconfirm'] = '<b>$inserted ünvanlar müvəffəqiyyətlə idxal edildi, mövcud $skipped buraxılıb</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Buraxılmış $skipped mövcud daxillər</b>';
 $messages['opnotpermitted'] = 'Əməliyyat qadağandır!';
@@ -121,17 +135,27 @@ $messages['maxgroupmembersreached'] = 'Qrupun ölçüsü imkan verilən maksimum
 $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ı';
+$messages['contactrestored'] = 'Kontakt(lar) bərpa edildi.';
 $messages['groupdeleted'] = 'Qrup silindi';
 $messages['grouprenamed'] = 'Qrupun adı dəyişdirildi';
 $messages['groupcreated'] = 'Qrup yaradıldı';
+$messages['savedsearchdeleted'] = 'Saxlanılmış sorğu silindi.';
+$messages['savedsearchdeleteerror'] = 'Saxlanılmış sorğunu silmək alınmadı.';
+$messages['savedsearchcreated'] = 'Saxlanılmış sorğu yaradıldı.';
+$messages['savedsearchcreateerror'] = 'Saxlanılmış sorğunu yaratmaq alınmadı';
 $messages['messagedeleted'] = 'Məktub(lar) uğurla silindi';
 $messages['messagemoved'] = 'Məktub(lar) uğurla köçürüldü';
 $messages['messagecopied'] = 'Məktub(lar) uğurla kopyalandı';
 $messages['messagemarked'] = 'Məktub(lar) uğurla işarələndi';
 $messages['autocompletechars'] = 'Avtokomplektasiya üçün $min işarə daxil edin';
+$messages['autocompletemore'] = 'Axtarış çox nəticə çıxardı. Lütfən, dəqiqləşdirin.';
 $messages['namecannotbeempty'] = 'Ad boş ola bilməz';
 $messages['nametoolong'] = 'Ad çox uzundur';
 $messages['folderupdated'] = 'Qovluq yeniləndi';
 $messages['foldercreated'] = 'Qovluq yaradıldı';
 $messages['invalidimageformat'] = 'Şəkil formatı düzgün deyil';
+$messages['mispellingsfound'] = 'Məktubda orfoqrafik səhvlər tapılıb';
+$messages['parentnotwritable'] = 'Qovluğu seçilmiş ana qovluğa köçürmək/yaratmaq alınmır. Giriş hüququ yoxdur.';
+$messages['messagetoobig'] = 'Məktubun bir hissəsi emal üçün böyükdür.';
 
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 0dde2147d..3a81a9f33 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -161,8 +160,8 @@ $labels['msgtext'] = 'Цялото съобщение';
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
 $labels['editasnew'] = 'Редактирай като ново';
-$labels['savemessage'] = 'Запиши в Чернови';
 $labels['sendmessage'] = 'Изпрати писмото';
+$labels['savemessage'] = 'Запиши в Чернови';
 $labels['addattachment'] = 'Прикачи файл';
 $labels['charset'] = 'Кодировка';
 $labels['editortype'] = 'Вид редактор';
@@ -285,7 +284,6 @@ $labels['importcontacts'] = 'Внасяне';
 $labels['importfromfile'] = 'Внасяне от файл';
 $labels['importtarget'] = 'Добави нови контакти в книгата с адреси';
 $labels['importreplace'] = 'Замени цялата книга с адреси';
-$labels['importtext'] = 'Можете да внесете контакти от съществуваща книга с адреси. В момента поддържане внасянето на адреси от vCard формат за данни.';
 $labels['done'] = 'Извършено';
 $labels['settingsfor'] = 'Настройки за';
 $labels['preferences'] = 'Настройки';
@@ -335,7 +333,6 @@ $labels['always'] = 'Винаги';
 $labels['showinlineimages'] = 'Покажи прикачените изображения след съобщението';
 $labels['autosavedraft'] = 'Автоматично записвай чернова';
 $labels['everynminutes'] = 'всеки $n минути';
-$labels['keepalive'] = 'Проверявай за нови съобщения на';
 $labels['never'] = 'никога';
 $labels['immediately'] = 'веднага';
 $labels['messagesdisplaying'] = 'Показване на събщенията';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 273284ca6..c4fdb3c85 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -124,8 +123,8 @@ $labels['unlimited'] = 'সীমাহীন';
 $labels['quicksearch'] = 'ঝটকরে খোজা';
 $labels['resetsearch'] = 'নতুনকরে খুজুন';
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['savemessage'] = 'খসড়া হিসাবে জমা করে রাখুন';
 $labels['sendmessage'] = 'এখুনি মেইল / চিঠিটি পাঠান';
+$labels['savemessage'] = 'খসড়া হিসাবে জমা করে রাখুন';
 $labels['addattachment'] = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Editor type';
@@ -183,7 +182,6 @@ $labels['import'] = 'আমদানি করুন';
 $labels['importcontacts'] = 'ঠিকানা আমদানি করুন';
 $labels['importfromfile'] = 'ফাইলের থেকে ঠিকানা আমদানি করুন';
 $labels['importreplace'] = 'পুরো ঠিকানার বইটি খালি করে নতুন ঠিকানা গুলো ভরুন';
-$labels['importtext'] = 'আপনি অন্য কোনো ঠিকানার বই (address book) আমাদের এখানে তুলতে পারেন। <br/>আমরা বর্তমানে <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> আকারে খালি ঠিকানা তুলতে পারি।';
 $labels['done'] = 'শেষ';
 $labels['settingsfor'] = 'খুটিনাটি';
 $labels['preferences'] = 'পছন্দ';
@@ -226,7 +224,6 @@ $labels['always'] = 'সবসময়';
 $labels['showinlineimages'] = 'মেইলের সাথে জোড়া লাগানো ছবি, মেইলের নিচে দেখা যাবে';
 $labels['autosavedraft'] = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
 $labels['everynminutes'] = 'প্রতি $n মিনিটে';
-$labels['keepalive'] = 'নতুন মেইল/চিঠি এসেছে কিনা তা দেখা হবে,';
 $labels['never'] = 'কখোনোই না';
 $labels['messagesdisplaying'] = 'মেইল/চিঠি দেখা যাচ্ছে';
 $labels['messagescomposition'] = 'মেইল/চিঠি লেখা হচ্ছে';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 41c35804b..98add04c5 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -90,8 +89,8 @@ $labels['unknown'] = 'Dianav';
 $labels['unlimited'] = 'didermen';
 $labels['quicksearch'] = 'Klask prim';
 $labels['resetsearch'] = 'Aderaouekaat ar glask';
-$labels['savemessage'] = 'Gwarediñ ar brouilhed-se';
 $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';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 2cdc4b8c6..9ceda61fd 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -135,6 +134,7 @@ $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Važno';
 $labels['unanswered'] = 'Neodgovoreno';
 $labels['deleted'] = 'Obrisano';
+$labels['undeleted'] = 'Nije obrisano';
 $labels['invert'] = 'Izokreni';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lista';
@@ -170,8 +170,9 @@ $labels['msgtext'] = 'Cijela poruka';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
 $labels['editasnew'] = 'Uredi kao novo';
-$labels['savemessage'] = 'Sačuvaj skicu';
+$labels['send'] = 'Pošalji';
 $labels['sendmessage'] = 'Pošalji poruku';
+$labels['savemessage'] = 'Sačuvaj skicu';
 $labels['addattachment'] = 'Priloži datoteku';
 $labels['charset'] = 'Skup znakova';
 $labels['editortype'] = 'Vrsta urednika';
@@ -199,6 +200,9 @@ $labels['nosubject'] = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
 $labels['isdraft'] = 'Ovo je skica.';
+$labels['andnmore'] = 'još $nr...';
+$labels['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';
@@ -299,7 +303,6 @@ $labels['importcontacts'] = 'Uvoz kontakata';
 $labels['importfromfile'] = 'Uvoz iz datoteke:';
 $labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
 $labels['importreplace'] = 'Zamijeni cijeli adresar';
-$labels['importtext'] = 'Možete dodati kontakte iz postojećeg adresara.<br/>Trenutno podržavamo uvoz adresa iz <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formata podataka.';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Podešavanja za';
 $labels['about'] = 'Informacije';
@@ -324,8 +327,11 @@ $labels['timezone'] = 'Vremenska zona';
 $labels['pagesize'] = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
 $labels['dstactive'] = 'Ljetno računanje vremena';
+$labels['showinextwin'] = 'Otvori poruku u novom prozoru';
+$labels['composeextwin'] = 'Napiši u novom prozor';
 $labels['htmleditor'] = 'Piši HTML poruke';
 $labels['htmlonreply'] = 'samo kao odgovor na HTML poruke';
+$labels['htmlonreplyandforward'] = 'prilikom prosljeđivanja ili odgovaranja na HTML poruku';
 $labels['htmlsignature'] = 'HTML potpis';
 $labels['previewpane'] = 'Prikaži pregled poruke';
 $labels['skin'] = 'Skin interfejsa';
@@ -351,7 +357,6 @@ $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži priložene slike ispod poruke';
 $labels['autosavedraft'] = 'Automatski sačuvaj skicu';
 $labels['everynminutes'] = 'svakih $n minuta';
-$labels['keepalive'] = 'Provjeri ima li novih poruka';
 $labels['never'] = 'nikad';
 $labels['immediately'] = 'odmah';
 $labels['messagesdisplaying'] = 'Prikaz poruka';
@@ -373,6 +378,7 @@ $labels['maintenance'] = 'Održavanje';
 $labels['newmessage'] = 'Nova poruka';
 $labels['signatureoptions'] = 'Opcija potpisa';
 $labels['whenreplying'] = 'Prilikom odgovora';
+$labels['replyempty'] = 'ne citiraj originalnu poruku';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
 $labels['replybottomposting'] = 'započni novu poruku ispod originala';
 $labels['replyremovesignature'] = 'Prilikom odgovaranja na poruku, ukloni originalni potpis iz poruke';
@@ -398,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Zanemari riječi sa brojevima';
 $labels['spellcheckignorecaps'] = 'Zanemari riječi napisane velikim slovima';
 $labels['addtodict'] = 'Dodaj u rječnik';
 $labels['mailtoprotohandler'] = 'Registruj upravljač protokola za mailto: linkovi';
+$labels['forwardmode'] = 'Prosljeđivanje poruka';
+$labels['inline'] = 'u istom redu';
+$labels['asattachment'] = 'kao prilog';
 $labels['folder'] = 'Folder';
 $labels['foldername'] = 'Naziv foldera';
 $labels['subscribed'] = 'Pretplaćen';
@@ -421,6 +430,7 @@ $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';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 3c5340654..b331ee900 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije moguće izvršiti operaciju. Folder je samo za čitanje.';
 $messages['errornoperm'] = 'Nije moguće izvršiti operaciju. Pristup je odbijen.';
 $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sačuvani.';
+$messages['invalidhost'] = 'Neispravno ime servera.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sandučetu.';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Doviđenja!';
 $messages['mailboxempty'] = 'Sanduče je prazno.';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Molimo vas da odaberete datoteku za dodavanje.'
 $messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivati.';
 $messages['contactaddedtogroup'] = 'Kontakti su uspješno dodani u ovu grupu.';
 $messages['contactremovedfromgroup'] = 'Kontakti su uspješno uklonjeni iz ove grupe.';
+$messages['nogroupassignmentschanged'] = 'Grupni zadaci nisu mijenjani.';
 $messages['importwait'] = 'Uvoz u toku, molimo sačekajte...';
-$messages['importerror'] = 'Greška pri uvozu! Datoteka ne sadrži pravilan vCard format.';
 $messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakata</b>';
 $messages['importconfirmskipped'] = '<b>Preskočeno $skipped postojećih unosa</b>';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 590306198..536085b1e 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
 $labels['deleted'] = 'Suprimit';
+$labels['undeleted'] = 'No s\'ha suprimit';
 $labels['invert'] = 'Inverteix';
 $labels['filter'] = 'Filtre';
 $labels['list'] = 'Llista';
@@ -169,8 +170,8 @@ $labels['msgtext'] = 'Missatge sencer';
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
 $labels['editasnew'] = 'Edita com a nou';
-$labels['savemessage'] = 'Desa aquest esborrany';
 $labels['sendmessage'] = 'Envia el missatge';
+$labels['savemessage'] = 'Desa aquest esborrany';
 $labels['addattachment'] = 'Adjunta un fitxer';
 $labels['charset'] = 'Codificació de caràcters';
 $labels['editortype'] = 'Tipus d\'editor';
@@ -198,6 +199,8 @@ $labels['nosubject'] = '(sense assumpte)';
 $labels['showimages'] = 'Mostra les imatges';
 $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
 $labels['isdraft'] = 'Aquest és un missatge esborrany.';
+$labels['andnmore'] = '$nr més...';
+$labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
 $labels['savesentmessagein'] = 'Desa el missatge enviat a';
@@ -298,7 +301,6 @@ $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['importtext'] = 'Podeu importar contactes des d\'una llibreta d\'adreces existent.<br/>Actualment s\'admet l\'importació d\'adreces amb el format <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Fet';
 $labels['settingsfor'] = 'Configuració per a';
 $labels['about'] = 'Quant a';
@@ -350,7 +352,6 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra les imatges adjuntes sota el missatge';
 $labels['autosavedraft'] = 'Desa l\'esborrany automàticament';
 $labels['everynminutes'] = 'cada $n minut(s)';
-$labels['keepalive'] = 'Comprova nous missatges a';
 $labels['never'] = 'mai';
 $labels['immediately'] = 'immediatament';
 $labels['messagesdisplaying'] = 'Vista de missatges';
@@ -372,8 +373,8 @@ $labels['maintenance'] = 'Manteniment';
 $labels['newmessage'] = 'Missatge nou';
 $labels['signatureoptions'] = 'Opcions de signatura';
 $labels['whenreplying'] = 'Quan es respon';
-$labels['replytopposting'] = 'comença el missatge nou a sobre de l\'original';
-$labels['replybottomposting'] = 'comença el missatge nou a sota de l\'original';
+$labels['replytopposting'] = 'comença el missatge nou per sobre de l\'original';
+$labels['replybottomposting'] = 'comença el missatge nou per sota de l\'original';
 $labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura original del missatge';
 $labels['autoaddsignature'] = 'Afegeix la signatura automàticament';
 $labels['newmessageonly'] = 'només si és un missatge nou';
@@ -397,6 +398,8 @@ $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['inline'] = 'en línia';
+$labels['asattachment'] = 'com adjunt';
 $labels['folder'] = 'Carpeta';
 $labels['foldername'] = 'Nom de la carpeta';
 $labels['subscribed'] = 'Subscrit';
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index c5b036820..5be0ae68f 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'S\'ha esgotat el temps de la sol·licitud';
 $messages['errorreadonly'] = 'Impossible de realitzar l\'operació. La carpeta és de només lectura.';
 $messages['errornoperm'] = 'Impossible de realitzar l\'operació. Permís denegat.';
 $messages['invalidrequest'] = 'Petició no vàlida! No s\'ha desat les dades.';
+$messages['invalidhost'] = 'Nom de servidor no vàlid.';
 $messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta bústia.';
 $messages['loggedout'] = 'Heu tancat la sessió. A reveure!';
 $messages['mailboxempty'] = 'La bústia és buida.';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Si us plau, seleccioneu un fitxer per pujar.';
 $messages['addresswriterror'] = 'La llibreta d\'adreces seleccionada no és modificable.';
 $messages['contactaddedtogroup'] = 'S\'han afegit correctament els contactes a aquest grup.';
 $messages['contactremovedfromgroup'] = 'S\'han suprimit correctament els contactes d\'aquest grup.';
+$messages['nogroupassignmentschanged'] = 'No s\'ha canviat cap assignació de grup.';
 $messages['importwait'] = 'S\'està important, espereu si us plau...';
-$messages['importerror'] = 'La importació ha fallat! El fitxer pujat no és un fitxer vCard vàlid.';
 $messages['importconfirm'] = '<b>S\'han importat $inserted contactes correctament</b>';
 $messages['importconfirmskipped'] = '<b>S\'han descartat $skipped entrades ja existents</b>';
 $messages['opnotpermitted'] = 'Operació no permesa!';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index b921a7a99..a30867a9b 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: AIKEN <lukas@aiken.cz>                                        |
+ | Author: Jan Žárský <jan.zarsky@gmail.com>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -135,6 +134,7 @@ $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
 $labels['deleted'] = 'Smazané';
+$labels['undeleted'] = 'Nesmazáno';
 $labels['invert'] = 'Převrátit';
 $labels['filter'] = 'Filtr';
 $labels['list'] = 'Seznam';
@@ -170,8 +170,9 @@ $labels['msgtext'] = 'Celá zpráva';
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
 $labels['editasnew'] = 'Upravit jako novou';
-$labels['savemessage'] = 'Uložit do rozepsaných';
+$labels['send'] = 'Odeslat';
 $labels['sendmessage'] = 'Odeslat zprávu nyní';
+$labels['savemessage'] = 'Uložit do rozepsaných';
 $labels['addattachment'] = 'Přidat přílohu';
 $labels['charset'] = 'Znaková sada';
 $labels['editortype'] = 'Typ editoru zpráv';
@@ -199,6 +200,9 @@ $labels['nosubject'] = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
 $labels['isdraft'] = 'Toto je šablona zprávy.';
+$labels['andnmore'] = '$nr dalších...';
+$labels['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';
@@ -299,7 +303,6 @@ $labels['importcontacts'] = 'Importovat kontakty';
 $labels['importfromfile'] = 'Importovat ze souboru';
 $labels['importtarget'] = 'Přidat nové kontakty do seznamu kontaktů:';
 $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
-$labels['importtext'] = 'Můžete nahrát kontakty z existujícího seznamu kontaktů. Podporujeme formát vCard.';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavení pro';
 $labels['about'] = 'O programu';
@@ -324,8 +327,10 @@ $labels['timezone'] = 'Časová zóna';
 $labels['pagesize'] = 'Řádků na stránku';
 $labels['signature'] = 'Podpis';
 $labels['dstactive'] = 'Letní čas';
+$labels['showinextwin'] = 'Otevřít zprávu v novém okně';
 $labels['htmleditor'] = 'Vytvářet HTML zprávy';
 $labels['htmlonreply'] = 'jen při odpovědi na HTML zprávy';
+$labels['htmlonreplyandforward'] = 'při přeposlání nebo odpovědi na HTML zprávu';
 $labels['htmlsignature'] = 'HTML podpis';
 $labels['previewpane'] = 'Zobrazit panel náhledu';
 $labels['skin'] = 'Vzhled';
@@ -351,7 +356,6 @@ $labels['always'] = 'vždy';
 $labels['showinlineimages'] = 'Zobrazovat připojené obrázky pod textem';
 $labels['autosavedraft'] = 'Automaticky uložit rozepsané zprávy';
 $labels['everynminutes'] = 'každých $n minut';
-$labels['keepalive'] = 'Zkontrolovat nové zprávy';
 $labels['never'] = 'nikdy';
 $labels['immediately'] = 'ihned';
 $labels['messagesdisplaying'] = 'Zobrazování zpráv';
@@ -373,6 +377,7 @@ $labels['maintenance'] = 'Údržba';
 $labels['newmessage'] = 'Nová zpráva';
 $labels['signatureoptions'] = 'Nastavení podpisu';
 $labels['whenreplying'] = 'Při odpovídání';
+$labels['replyempty'] = 'necitovat původní zprávu';
 $labels['replytopposting'] = 'začít novou zprávu nad původní';
 $labels['replybottomposting'] = 'začít novou zprávu pod původní';
 $labels['replyremovesignature'] = 'Při odpovídání odstranit ze zprávy původní podpis';
@@ -398,6 +403,9 @@ $labels['spellcheckignorenums'] = 'Ignorovat slova obsahující čísla';
 $labels['spellcheckignorecaps'] = 'Ignorovat slova psaná velkými písmeny';
 $labels['addtodict'] = 'Přidat do slovníku';
 $labels['mailtoprotohandler'] = 'Zaregistrovat handler pro odkazy „mailto:“';
+$labels['forwardmode'] = 'Přeposlat zprávu';
+$labels['inline'] = 'vloženě';
+$labels['asattachment'] = 'jako přílohu';
 $labels['folder'] = 'Složka';
 $labels['foldername'] = 'Jméno složky';
 $labels['subscribed'] = 'Vybráno';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 0335c62a1..4a2e6f8c8 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tomáš Kyzlink                                               |
+ | Author: Zbynek Vanzura <heptau@gmail.com>                             |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Došlo k vypršení požadavku';
 $messages['errorreadonly'] = 'Příkaz nelze provést, složka je určena jen ke čtení.';
 $messages['errornoperm'] = 'Příkaz nelze provést, nemáte oprávnění.';
 $messages['invalidrequest'] = 'Nesprávný požadavek. Data nebyla uložena.';
+$messages['invalidhost'] = 'Špatné jméno serveru.';
 $messages['nomessagesfound'] = 'Ve schránce nebyla nalezena žádná zpráva';
 $messages['loggedout'] = 'Byli jste úspěšně odhlášeni. Nashledanou!';
 $messages['mailboxempty'] = 'Schránka je prázdná';
@@ -115,7 +116,6 @@ $messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný'
 $messages['contactaddedtogroup'] = 'Kontakty byly úspěšně přidány do této skupiny';
 $messages['contactremovedfromgroup'] = 'Kontakty byly odstraněny z této skupiny';
 $messages['importwait'] = 'Importuji, prosím čekejte...';
-$messages['importerror'] = 'Během importu nastala chyba! Nahraný soubor není ve formátu vCard.';
 $messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno: $names';
 $messages['importconfirmskipped'] = '<b>Přeskočeno $skipped existujících položek</b>';
 $messages['opnotpermitted'] = 'Operace není povolena!';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 3598ab0c6..d9887416a 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
+ | Author: Dafydd Tomos                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -94,7 +93,7 @@ $labels['longoct'] = 'Hydref';
 $labels['longnov'] = 'Tachwedd';
 $labels['longdec'] = 'Rhagfyr';
 $labels['today'] = 'Heddiw';
-$labels['refresh'] = 'Adnewyddu';
+$labels['refresh'] = 'Ail-ofyn';
 $labels['checkmail'] = 'Edrych am negeseuon newydd';
 $labels['compose'] = 'Ysgrifennu neges';
 $labels['writenewmessage'] = 'Creu neges newydd';
@@ -135,6 +134,7 @@ $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
 $labels['unanswered'] = 'Heb ei ateb';
 $labels['deleted'] = 'Dilewyd';
+$labels['undeleted'] = 'Heb ei ddileu';
 $labels['invert'] = 'Gwrth-droi';
 $labels['filter'] = 'Hidlo';
 $labels['list'] = 'Rhestr';
@@ -170,8 +170,9 @@ $labels['msgtext'] = 'Y neges yn llawn';
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
 $labels['editasnew'] = 'Golygu fel neges newydd';
-$labels['savemessage'] = 'Cadw\'r drafft hwn';
+$labels['send'] = 'Anfon';
 $labels['sendmessage'] = 'Danfon nawr';
+$labels['savemessage'] = 'Cadw\'r drafft hwn';
 $labels['addattachment'] = 'Atodi ffeil';
 $labels['charset'] = 'Set nodiau';
 $labels['editortype'] = 'Math golygydd';
@@ -199,6 +200,9 @@ $labels['nosubject'] = '(dim pwnc)';
 $labels['showimages'] = 'Dangos lluniau';
 $labels['alwaysshow'] = 'Dangos lluniau bob amser o $sender';
 $labels['isdraft'] = 'Mae hwn yn neges ddrafft';
+$labels['andnmore'] = '$nr mwy...';
+$labels['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';
@@ -299,7 +303,6 @@ $labels['importcontacts'] = 'Mewnforio cysylltiadau';
 $labels['importfromfile'] = 'Mewnforio o ffeil:';
 $labels['importtarget'] = 'Ychwanegu cysylltiadau newydd i\'r llyfr cyfeiriad:';
 $labels['importreplace'] = 'Dileu y llyfr cyfeiriadau cyfan wrth lwytho';
-$labels['importtext'] = 'Fe allwch chi lwytho fyny cysylltiadau o lyfr cyfeiriadau sy\'n bodoli yn barod. Ar hyn o bryd rydyn\' ni\'n cefnogi mewnforio cyfeiriadau yn y fformat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Wedi gorffen';
 $labels['settingsfor'] = 'Gosodiadau ar gyfer';
 $labels['about'] = 'Amdan';
@@ -324,8 +327,11 @@ $labels['timezone'] = 'Parth amser';
 $labels['pagesize'] = 'Rhesi ar bob tudalen';
 $labels['signature'] = 'Llofnod';
 $labels['dstactive'] = 'Amser arbed golau ddydd';
+$labels['showinextwin'] = 'Agor neges mewn ffenest newydd';
+$labels['composeextwin'] = 'Ysgrifennu mewn ffenest newydd';
 $labels['htmleditor'] = 'Ysgrifennu negeseuon HTML';
 $labels['htmlonreply'] = 'wrth ateb i neges HTML yn unig';
+$labels['htmlonreplyandforward'] = 'wrth ddanfon ymlaen neu ymateb i neges HTML';
 $labels['htmlsignature'] = 'Llofnod HTML';
 $labels['previewpane'] = 'Dangos ffenest rhagolwg';
 $labels['skin'] = 'Croen rhyngwyneb';
@@ -351,7 +357,6 @@ $labels['always'] = 'bob amser';
 $labels['showinlineimages'] = 'Dangos lluniau atodol islaw\'r neges';
 $labels['autosavedraft'] = 'Cadw drafft yn awtomatig';
 $labels['everynminutes'] = 'bob $n munud';
-$labels['keepalive'] = 'Gofyn am negeseuon newydd ymlaen';
 $labels['never'] = 'byth';
 $labels['immediately'] = 'ar unwaith';
 $labels['messagesdisplaying'] = 'Dangos Negeseuon';
@@ -373,6 +378,7 @@ $labels['maintenance'] = 'Gwaith cynnal a chadw';
 $labels['newmessage'] = 'Neges Newydd';
 $labels['signatureoptions'] = 'Dewisiadau Llofnod';
 $labels['whenreplying'] = 'Wrth ateb';
+$labels['replyempty'] = 'peidio dyfynnu\'r neges wreiddiol';
 $labels['replytopposting'] = 'dechrau\'r neges newydd uwchben y neges wreiddiol';
 $labels['replybottomposting'] = 'dechrau\'r neges newydd o dan y neges wreiddiol';
 $labels['replyremovesignature'] = 'Wrth ateb, dileu\'r llofnod gwreiddiol o\'r neges';
@@ -398,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Anwybyddu geiriau gyda rhifau';
 $labels['spellcheckignorecaps'] = 'Anwybyddu geiriau sy\'n briflythrennau yn gyfangwbl';
 $labels['addtodict'] = 'Ychwanegu i\'r geiriadur';
 $labels['mailtoprotohandler'] = 'Cofrestru trafodwr protocol ar gyfer dolenni mailto:';
+$labels['forwardmode'] = 'Danfon neges ymlaen';
+$labels['inline'] = 'mewnlin';
+$labels['asattachment'] = 'fel atodiad';
 $labels['folder'] = 'Ffolder';
 $labels['foldername'] = 'Enw ffolder';
 $labels['subscribed'] = 'Tanysgrifwyd';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 72ef6a2cf..26f120b84 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Cais wedi dod i derfyn amser';
 $messages['errorreadonly'] = 'Methwyd gweithredu. Mae\'r ffolder yn darllen-yn-unig';
 $messages['errornoperm'] = 'Methwyd gweithredu. Gwrthodwyd caniatad';
 $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
+$messages['invalidhost'] = 'Enw gweinydd annilys.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
 $messages['loggedout'] = 'Rydych wedi gorffen y sesiwn yn llwyddianus. Hwyl fawr!';
 $messages['mailboxempty'] = 'Blwch yn wag';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Dewiswch ffeil i\'w lwytho fyny';
 $messages['addresswriterror'] = 'Nid yw\'n bosib ysgrifennu i\'r llyfr cyfeiriadau';
 $messages['contactaddedtogroup'] = 'Ychwanegwyd y cysylltiadau i\'r grŵp yma yn llwyddiannus';
 $messages['contactremovedfromgroup'] = 'Dilëwyd y cysylltiadau o\'r grŵp yma yn llwyddiannus';
+$messages['nogroupassignmentschanged'] = 'Ni newidwyd aseiniadiau grŵp.';
 $messages['importwait'] = 'Yn mewnforio, arhoswch os gwelwch yn dda...';
-$messages['importerror'] = 'Methwyd a mewnforio! Nid yw\'r ffeil a lwythwyd fyny yn ffeil vCard dilys.';
 $messages['importconfirm'] = '<b>Fe mewnforiwyd $inserted cyswllt yn llwyddiannus, anwybyddwyd $skipped cofnod presennol</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Neidiwyd $skipped cofnod oedd yn bodoli</b>';
 $messages['opnotpermitted'] = 'Ni chaniateir y weithred!';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 78fbc0891..0e1dc0063 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = 'Hele beskeden';
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['editasnew'] = 'Redigér som ny';
-$labels['savemessage'] = 'Gem som kladde';
 $labels['sendmessage'] = 'Send besked';
+$labels['savemessage'] = 'Gem som kladde';
 $labels['addattachment'] = 'Vedhæft en fil';
 $labels['charset'] = 'Tegnsæt';
 $labels['editortype'] = 'Tekstbehandler';
@@ -299,7 +298,6 @@ $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['importtext'] = 'Du kan uploade kontakter fra en eksisterende adressebog.Vi understøtter i øjeblikket import af adresser i vCard formatet.';
 $labels['done'] = 'Færdig';
 $labels['settingsfor'] = 'Indstillinger for';
 $labels['about'] = 'Om';
@@ -351,7 +349,6 @@ $labels['always'] = 'altid';
 $labels['showinlineimages'] = 'Vis vedhæftede billeder under beskeden';
 $labels['autosavedraft'] = 'Gem kladde automatisk';
 $labels['everynminutes'] = 'hver $n. minut';
-$labels['keepalive'] = 'Tjek for nye beskeder';
 $labels['never'] = 'aldrig';
 $labels['immediately'] = 'straks';
 $labels['messagesdisplaying'] = 'Viser beskeder';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index f9f9531e8..5d9200267 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
 $labels['deleted'] = 'Gelöschte';
+$labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Umkehren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Liste';
@@ -199,6 +200,9 @@ $labels['nosubject'] = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
 $labels['isdraft'] = 'Dies ist ein Entwurf';
+$labels['andnmore'] = '$nr weitere...';
+$labels['togglemoreheaders'] = 'Weitere Kopfzeilen anzeigen';
+$labels['togglefullheaders'] = 'Original-Kopfzeilen ein-/ausblenden';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
@@ -299,7 +303,6 @@ $labels['importcontacts'] = 'Adressen importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
 $labels['importtarget'] = 'Neue Kontakte speichern in:';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
-$labels['importtext'] = 'Sie können Kontakte aus einem bestehenden Adressbuch hochladen.<br/>Es können Adressbücher im <a href="http://de.wikipedia.org/wiki/VCard">vCard-Format</a> importiert werden.';
 $labels['done'] = 'Fertig';
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
@@ -328,6 +331,7 @@ $labels['showinextwin'] = 'Nachrichten in neuem Fenster öffnen';
 $labels['composeextwin'] = 'Nachrichten in neuem Fenster verfassen';
 $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
 $labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
+$labels['htmlonreplyandforward'] = 'Antworten oder Weiterleiten einer HTML-Nachricht';
 $labels['htmlsignature'] = 'HTML-Signatur';
 $labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflächendesign';
@@ -353,7 +357,6 @@ $labels['always'] = 'immer';
 $labels['showinlineimages'] = 'Angehängte Bilder unter der Nachricht anzeigen';
 $labels['autosavedraft'] = 'Entwurf autom. speichern';
 $labels['everynminutes'] = '$n Minute(n)';
-$labels['keepalive'] = 'Auf neue Nachrichten prüfen nach';
 $labels['never'] = 'nie';
 $labels['immediately'] = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
@@ -375,6 +378,7 @@ $labels['maintenance'] = 'Wartung';
 $labels['newmessage'] = 'Neue Nachrichten';
 $labels['signatureoptions'] = 'Signatur';
 $labels['whenreplying'] = 'Beantworten einer Nachricht';
+$labels['replyempty'] = 'Antwort ohne Zitat der Originalnachricht';
 $labels['replytopposting'] = 'Antwort über der Originalnachricht';
 $labels['replybottomposting'] = 'Antwort unter der Originalnachricht';
 $labels['replyremovesignature'] = 'Beim Antworten die Signatur der Originalnachricht entfernen';
@@ -400,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
 $labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Grossbuchstaben bestehen';
 $labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
 $labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
+$labels['forwardmode'] = 'Weiterleiten einer Nachricht';
+$labels['inline'] = 'eingebettet';
+$labels['asattachment'] = 'als Anhang';
 $labels['folder'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index a34358034..68a7c8967 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -27,6 +26,7 @@ $messages['requesttimedout'] = 'Zeitlimit überschritten';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
+$messages['invalidhost'] = 'Ungültiger Servername';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
 $messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Ordner ist leer';
@@ -117,7 +117,6 @@ $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.'
 $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verändert.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
-$messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 5c6303479..f1e12dc95 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
+ | Author: SimonFS <simonschuette@arcor.de>                              |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
 $labels['deleted'] = 'Gelöschte';
+$labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Invertieren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Liste';
@@ -299,7 +300,6 @@ $labels['importcontacts'] = 'Kontakte importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
 $labels['importtarget'] = 'Einen neuen Kontakt hinzufügen:';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
-$labels['importtext'] = 'Sie können Kontakte aus einem bestehenden Adressbuch hochladen. Zur Zeit können Adressbücher im vCard-Format importiert werden.';
 $labels['done'] = 'Fertig';
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
@@ -353,7 +353,6 @@ $labels['always'] = 'immer';
 $labels['showinlineimages'] = 'Angehängte Bilder unter der Nachricht anzeigen';
 $labels['autosavedraft'] = 'Entwurf automatisch speichern';
 $labels['everynminutes'] = '$n Minute(n)';
-$labels['keepalive'] = 'Auf neue Nachrichten prüfen nach';
 $labels['never'] = 'nie';
 $labels['immediately'] = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
@@ -423,6 +422,7 @@ $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';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index d8b78d6c8..6c8e58fd1 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: akn                                                           |
+ | Author: Dennis Baudys                                                 |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,10 +26,11 @@ $messages['requesttimedout'] = 'Zeitüberschreitung der Anforderung';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
+$messages['invalidhost'] = 'Ungültiger Server Name';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
 $messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
-$messages['mailboxempty'] = 'Ordner ist leer.';
-$messages['loading'] = 'Lädt…';
+$messages['mailboxempty'] = 'Mailbox ist leer.';
+$messages['loading'] = 'Wird geladen ...';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren au
 $messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.';
 $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.';
 $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
+$messages['nogroupassignmentschanged'] = 'Es wurden keine Gruppenzuordnungen geändert.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
-$messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen.</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index b5fe03447..2f0ca0bf5 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr>                               |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = 'Σε όλο το μήνυμα';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
 $labels['editasnew'] = 'Επεξεργασία σαν νέο';
-$labels['savemessage'] = 'Αποθήκευση ως πρόχειρο';
 $labels['sendmessage'] = 'Αποστολή μηνύματος';
+$labels['savemessage'] = 'Αποθήκευση ως πρόχειρο';
 $labels['addattachment'] = 'Επισύναψη αρχείου';
 $labels['charset'] = 'Κωδικοποίηση χαρακτήρων';
 $labels['editortype'] = 'Είδος επεξεργαστή κειμένου';
@@ -298,7 +297,6 @@ $labels['importcontacts'] = 'Εισαγωγή επαφών';
 $labels['importfromfile'] = 'Εισαγωγή από το αρχείο:';
 $labels['importtarget'] = 'Προσθήκη νέων επαφών στο βιβλίο διευθύνσεων:';
 $labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
-$labels['importtext'] = 'Μπορείτε να αποστείλετε επαφές από ένα υπάρχων βιβλίο διευθύνσεων.<br/>Προς το παρόν, όσον αφορά την εισαγωγή επαφών, επιτρέπετε η εισαγωγή επαφών σε μορφή <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Ολοκληρώθηκε';
 $labels['settingsfor'] = 'Ρυθμίσεις για';
 $labels['about'] = 'Σχετικά';
@@ -349,7 +347,6 @@ $labels['always'] = 'πάντα';
 $labels['showinlineimages'] = 'Οι συνημμένες εικόνες να προβάλλονται στο τέλος του μηνήματος';
 $labels['autosavedraft'] = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
 $labels['everynminutes'] = 'κάθε $n λεπτό/α';
-$labels['keepalive'] = 'Έλεγχος για νέα μηνύματα';
 $labels['never'] = 'ποτέ';
 $labels['immediately'] = 'άμεσα';
 $labels['messagesdisplaying'] = 'Προβολή Μηνυμάτων';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 4129fba63..6db0bd716 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
 */
 
@@ -169,8 +169,8 @@ $labels['msgtext'] = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['editasnew'] = 'Edit as new';
-$labels['savemessage'] = 'Save this draft';
 $labels['sendmessage'] = 'Send now';
+$labels['savemessage'] = 'Save this draft';
 $labels['addattachment'] = 'Attach a file';
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Editor type';
@@ -298,7 +298,6 @@ $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['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = 'Done';
 $labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'About';
@@ -350,7 +349,6 @@ $labels['always'] = 'always';
 $labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft'] = 'Automatically save draft';
 $labels['everynminutes'] = 'every $n minute(s)';
-$labels['keepalive'] = 'Check for new messages on';
 $labels['never'] = 'never';
 $labels['immediately'] = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index af3940c92..a9a76e2fc 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -168,8 +168,8 @@ $labels['msgtext'] = 'Tuta mesaĝo';
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
 $labels['editasnew'] = 'Redaktu kiel nova';
-$labels['savemessage'] = 'Savu ĉi tiun malneton';
 $labels['sendmessage'] = 'Sendu mesaĝon';
+$labels['savemessage'] = 'Savu ĉi tiun malneton';
 $labels['addattachment'] = 'Alfiksu dosieron';
 $labels['charset'] = 'Karaktraro';
 $labels['editortype'] = 'Speco de redaktilo';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index ec69eea6c..1f8324954 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -141,8 +140,8 @@ $labels['msgtext'] = 'Mensaje completo';
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
 $labels['editasnew'] = 'Editar como nuevo';
-$labels['savemessage'] = 'Guardar como borrador';
 $labels['sendmessage'] = 'Enviar ahora el mensaje';
+$labels['savemessage'] = 'Guardar como borrador';
 $labels['addattachment'] = 'Añadir un archivo';
 $labels['charset'] = 'Codificación';
 $labels['editortype'] = 'Tipo de editor';
@@ -202,7 +201,6 @@ $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
-$labels['importtext'] = 'Puede importar contactos desde una lista existente.<br/>Actualmente sólo soportamos el formato <a href="http://es.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
 $labels['preferences'] = 'Preferencias';
@@ -247,7 +245,6 @@ $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['keepalive'] = 'Verificar si hay nuevos mensajes en';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index d47bd0f4b..d0d7f7942 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jorge López <jorge@adobo.org>                                |
+ | Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>                |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
 $labels['unanswered'] = 'Sin respuesta';
 $labels['deleted'] = 'Eliminado';
+$labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Mensaje completo';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['editasnew'] = 'Editar como nuevo';
-$labels['savemessage'] = 'Guardar como borrador';
+$labels['send'] = 'Enviar';
 $labels['sendmessage'] = 'Enviar ahora el mensaje';
+$labels['savemessage'] = 'Guardar como borrador';
 $labels['addattachment'] = 'Adjuntar un archivo';
 $labels['charset'] = 'Codificación';
 $labels['editortype'] = 'Tipo de editor';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
 $labels['isdraft'] = 'Este mensaje es un borrador';
+$labels['andnmore'] = '$nr más…';
+$labels['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';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde archivo:';
 $labels['importtarget'] = 'Añadir un nuevo contacto a la los contactos:';
 $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
-$labels['importtext'] = 'Puede importar contactos desde una lista existente.<br/>Actualmente sólo soportamos el formato <a href="http://es.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
 $labels['about'] = 'Acerca de';
@@ -323,9 +327,11 @@ $labels['timezone'] = 'Zona horaria';
 $labels['pagesize'] = 'Filas por página';
 $labels['signature'] = 'Firma';
 $labels['dstactive'] = 'Cambio de horario';
+$labels['showinextwin'] = 'Abrir mensaje en una ventana nueva';
 $labels['composeextwin'] = 'Redactar en una ventana nueva';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
 $labels['htmlonreply'] = 'sólo en respuesta a un mensaje HTML';
+$labels['htmlonreplyandforward'] = 'en reenvío o respuesta al mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
@@ -351,7 +357,6 @@ $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['keepalive'] = 'Comprobar si hay mensajes nuevos';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
@@ -373,6 +378,7 @@ $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo mensaje';
 $labels['signatureoptions'] = 'Opciones de firma';
 $labels['whenreplying'] = 'Al responder';
+$labels['replyempty'] = 'no citar el mensaje original';
 $labels['replytopposting'] = 'empezar un mensaje nuevo encima del original';
 $labels['replybottomposting'] = 'empezar un mensaje nuevo debajo del original';
 $labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al responder';
@@ -398,6 +404,7 @@ $labels['spellcheckignorenums'] = 'Ignorar palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar palabras con todo mayúsculas';
 $labels['addtodict'] = 'Añadir al diccionario';
 $labels['mailtoprotohandler'] = 'Registrar controlador de protocolo para enlaces mailto:';
+$labels['asattachment'] = 'como adjunto';
 $labels['folder'] = 'Bandeja';
 $labels['foldername'] = 'Nombre de bandeja';
 $labels['subscribed'] = 'Suscrita';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 186554ff7..0cb075174 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pompilos <ciordia@gmail.com>                                  |
+ | Author: Jose Antonio Morales Santiago <cike@txsolutions.com>          |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'No se ha podido hacer. La bandeja es sólo de lectura';
 $messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
+$messages['invalidhost'] = 'Nombre de servidor inválido';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado bien la sesión. ¡Hasta pronto!';
 $messages['mailboxempty'] = 'La casilla está vacía';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
 $messages['addresswriterror'] = 'No se puede escribir la dirección de contacto seleccionada';
 $messages['contactaddedtogroup'] = 'Se han añadido correctamente los contactos a este grupo.';
 $messages['contactremovedfromgroup'] = 'Se han borrado correctamente los contactos de este grupo.';
+$messages['nogroupassignmentschanged'] = 'No hay cambios en la asgnación de grupos';
 $messages['importwait'] = 'Importando, espere...';
-$messages['importerror'] = '¡Error al importar! Este archivo no es un formato válido vCard.';
 $messages['importconfirm'] = '<b>Se han insertado: $inserted contactos, y se han omitido: $skipped porque ya existían</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = 'Ignorar $skipped entradas existentes';
 $messages['opnotpermitted'] = '¡Operación no permitida!';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 3b7c1300b..9215c3d70 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -40,6 +40,7 @@ $labels['size'] = 'Suurus';
 $labels['priority'] = 'Tähtsus';
 $labels['organization'] = 'Organisatsioon';
 $labels['readstatus'] = 'Lugemise staatus';
+$labels['listoptions'] = 'Nimekirja valikud…';
 $labels['mailboxlist'] = 'Kaustad';
 $labels['folders'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
@@ -133,6 +134,7 @@ $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
 $labels['unanswered'] = 'Vastamata';
 $labels['deleted'] = 'Kustutatud';
+$labels['undeleted'] = 'Pole kustutatud';
 $labels['invert'] = 'Vaheta';
 $labels['filter'] = 'Filtreeri';
 $labels['list'] = 'Nimekiri';
@@ -168,8 +170,9 @@ $labels['msgtext'] = 'Kogu kirjast';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
 $labels['editasnew'] = 'Kasuta uue kirja põhjana';
-$labels['savemessage'] = 'Salvesta mustand';
+$labels['send'] = 'Saada';
 $labels['sendmessage'] = 'Saada kiri kohe';
+$labels['savemessage'] = 'Salvesta mustand';
 $labels['addattachment'] = 'Lisa fail';
 $labels['charset'] = 'Märgistik';
 $labels['editortype'] = 'Redaktori tüüp';
@@ -197,6 +200,9 @@ $labels['nosubject'] = '(teema puudub)';
 $labels['showimages'] = 'Näita pilte';
 $labels['alwaysshow'] = 'Näita alati $sender saadetud pilte';
 $labels['isdraft'] = 'See on mustand.';
+$labels['andnmore'] = '$nr veel…';
+$labels['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';
@@ -282,6 +288,7 @@ $labels['exportvcards'] = 'Ekspordi kontaktid vCardi formaadis';
 $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';
@@ -296,7 +303,6 @@ $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
 $labels['importtarget'] = 'Lisa uued kontaktid aadressiraamatusse:';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
-$labels['importtext'] = 'Sa saad üle kanda kontakte olemasolevast aadressiraamatust. Praegu on toetatud <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formaat.';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Kasutajaeelistused kontole';
 $labels['about'] = 'Programmist lähemalt';
@@ -321,8 +327,11 @@ $labels['timezone'] = 'Ajavöönd';
 $labels['pagesize'] = 'Ridu lehe kohta';
 $labels['signature'] = 'Allkiri';
 $labels['dstactive'] = 'Suveaeg';
+$labels['showinextwin'] = 'Ava kiri uues aknas';
+$labels['composeextwin'] = 'Koosta uues aknas';
 $labels['htmleditor'] = 'Kasuta HTML redaktorit';
 $labels['htmlonreply'] = 'vaid HTML-vormingus kirjale vastamisel';
+$labels['htmlonreplyandforward'] = 'edastamisel või HTML kirjale vastates';
 $labels['htmlsignature'] = 'HTML allkiri';
 $labels['previewpane'] = 'Näita eelvaate akent';
 $labels['skin'] = 'Kliendi välimus';
@@ -341,13 +350,13 @@ $labels['readwhendeleted'] = 'Märgi kiri kustutamisel loetuks';
 $labels['flagfordeletion'] = 'Kustutamise asemel märgi kiri kustutatavaks';
 $labels['skipdeleted'] = 'Ära näita kustutatud kirju';
 $labels['deletealways'] = 'Kui kirjade prügikasti liigutamine nurjub, siis kustuta need';
+$labels['deletejunk'] = 'Kustuta Rämps kaustas olevad kirjad kohe';
 $labels['showremoteimages'] = 'Näita kirjas kaugelt kaasatud pilte';
 $labels['fromknownsenders'] = 'tuntud saatjatelt';
 $labels['always'] = 'alati';
 $labels['showinlineimages'] = 'Näita manustatud pilte kirja all';
 $labels['autosavedraft'] = 'Salvesta mustandid automaatselt';
 $labels['everynminutes'] = 'iga $n minuti tagant';
-$labels['keepalive'] = 'Kontrolli uusi kirju';
 $labels['never'] = 'mitte kunagi';
 $labels['immediately'] = 'otsekohe';
 $labels['messagesdisplaying'] = 'Kirjade näitamine';
@@ -369,6 +378,7 @@ $labels['maintenance'] = 'Hooldus';
 $labels['newmessage'] = 'Uus kiri';
 $labels['signatureoptions'] = 'Allkirja valikud';
 $labels['whenreplying'] = 'Vastates';
+$labels['replyempty'] = 'ära tsiteeri esialgset kirja';
 $labels['replytopposting'] = 'alusta uue kirjaga esialgse kohal';
 $labels['replybottomposting'] = 'alusta uue kirjaga esialgse all';
 $labels['replyremovesignature'] = 'Vastates eemalda kirjast esialgne allkiri';
@@ -386,6 +396,7 @@ $labels['reqdsn'] = 'Nõua alati kohalejõudmisteavitust';
 $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastatakse';
 $labels['defaultaddressbook'] = 'Lisa kontaktid valitud aadressiraamatusse';
 $labels['autocompletesingle'] = 'Automaatlõpetuses jäta alternatiivne e-posti aadress vahele';
+$labels['listnamedisplay'] = 'Näita kontakte kui';
 $labels['spellcheckbeforesend'] = 'Kontrolli õigekirja enne saatmist';
 $labels['spellcheckoptions'] = 'Õigekirjakontrolli valikud';
 $labels['spellcheckignoresyms'] = 'Ignoreeri sõnu, milles on sümbolid';
@@ -393,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignoreeri sõnu, milles on numbreid';
 $labels['spellcheckignorecaps'] = 'Ignoreeri suurte tähtedega kirjutatud sõnu';
 $labels['addtodict'] = 'Lisa sõnastikku';
 $labels['mailtoprotohandler'] = 'Kasuta mailto: linkide avamisel';
+$labels['forwardmode'] = 'Kirja edastamine';
+$labels['inline'] = 'kirja sees';
+$labels['asattachment'] = 'manusena';
 $labels['folder'] = 'Kaust';
 $labels['foldername'] = 'Kausta nimi';
 $labels['subscribed'] = 'Näitan';
@@ -416,6 +430,7 @@ $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';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 2d8bf78cf..5a7916fb3 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: yllar                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,9 +22,11 @@ $messages['storageerror'] = 'Ei õnnestunud IMAP serveriga ühendust luua';
 $messages['servererror'] = 'Serveri tõrge!';
 $messages['servererrormsg'] = 'Serveri tõrge: $msg';
 $messages['dberror'] = 'Andmebaasi tõrge!';
+$messages['requesttimedout'] = 'Päring aegus';
 $messages['errorreadonly'] = 'Operatsioon nurjus. Kaustale on vaid lugemisõigus';
 $messages['errornoperm'] = 'Operatsioon nurjus. Ligipääsu õigused puuduvad';
 $messages['invalidrequest'] = 'Lubamatu päring! Andmeid ei salvestatud.';
+$messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tühi olevat';
 $messages['loggedout'] = 'Sinu seanss on edukalt lõpetatud. Nägemiseni!';
 $messages['mailboxempty'] = 'Postkast on tühi';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Palun vali üleslaadimiseks fail';
 $messages['addresswriterror'] = 'Valitud aadressiraamat pole kirjutatav';
 $messages['contactaddedtogroup'] = 'Kontaktide lisamine gruppi õnnestus';
 $messages['contactremovedfromgroup'] = 'Kontaktide eemaldamine grupist õnnestus';
+$messages['nogroupassignmentschanged'] = 'Gruppide ülesandeid ei muudetud';
 $messages['importwait'] = 'Impordin, palun oota...';
-$messages['importerror'] = 'Import nurjus! Üleslaaditud fail ei ole vCard formaadis.';
 $messages['importconfirm'] = '<b>Edukalt imporditud $inserted kontakti, $skipped olemasolevat sissekannet vahele jäetud</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b> $skipped olemasolevat kirjet jäeti vahele</b>';
 $messages['opnotpermitted'] = 'Tegevus pole lubatud!';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index a7aa07445..24ab8465c 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aritz <aritz@itxaropena.org>                                  |
+ | Author: Asier Iturralde Sarasola                                      |
  +-----------------------------------------------------------------------+
 */
 
@@ -101,6 +101,7 @@ $labels['reply'] = 'Erantzun';
 $labels['replytomessage'] = 'Mezuari erantzun';
 $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
 $labels['replyall'] = 'Guztiei erantzun';
+$labels['replylist'] = 'Erantzun zerrenda';
 $labels['forward'] = 'Berbidali';
 $labels['forwardattachment'] = 'Erantsi gisa berbidali';
 $labels['forwardmessage'] = 'Mezua Birbidali';
@@ -137,8 +138,8 @@ $labels['unknown'] = 'ezezaguna';
 $labels['unlimited'] = 'mugagabea';
 $labels['quicksearch'] = 'Bilaketa azkarra';
 $labels['resetsearch'] = 'Bilaketa berrabiarazi';
-$labels['savemessage'] = 'Zirriborro hau gorde';
 $labels['sendmessage'] = 'Mezua orain bidali';
+$labels['savemessage'] = 'Zirriborro hau gorde';
 $labels['addattachment'] = 'Fitxategia erantsi';
 $labels['charset'] = 'Karaktere jokoa';
 $labels['editortype'] = 'Editore mota';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 742668ccd..09f672134 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -124,8 +123,8 @@ $labels['unlimited'] = 'نامعين/ نامحدود';
 $labels['quicksearch'] = 'جستجوی سریع';
 $labels['resetsearch'] = 'بازنشاندن جستجو';
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
 $labels['sendmessage'] = 'پيغام را همين حالا ارسال کنيد';
+$labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
 $labels['addattachment'] = 'ضميمه نمودن يک فايل';
 $labels['charset'] = 'ست کرکتر ها';
 $labels['editortype'] = 'روش تصحیح کننده / نوشتاری';
@@ -183,7 +182,6 @@ $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'آدرس ها را وارد نمایید';
 $labels['importfromfile'] = 'از یک فایل وارد نمایید';
 $labels['importreplace'] = 'تمام کتاب آدرس ها را عوض نمایید';
-$labels['importtext'] = 'شما میتوانید که آدرس ها را از یاک کتاب آدرس های موجوده وارد نمایید<br/>شما میتوانید که آدرس ها را به فرمت <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>وارد نمایید';
 $labels['done'] = 'اجرا شد';
 $labels['settingsfor'] = 'تنظیمات برای';
 $labels['preferences'] = 'ترجيحات';
@@ -226,7 +224,6 @@ $labels['always'] = 'همیشه';
 $labels['showinlineimages'] = 'تصاویر ضمیمه شده را در پایین پیام نشان دهید.';
 $labels['autosavedraft'] = 'بصورت خودکار پیش نويس را حفظ کنيد';
 $labels['everynminutes'] = 'دقیفه$n هر';
-$labels['keepalive'] = 'بررسي کردن پيغام های جديد';
 $labels['never'] = 'هیچگاه';
 $labels['messagesdisplaying'] = 'نمایش دادن پیام ها';
 $labels['messagescomposition'] = 'ایجاد کردن پیام جدید';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 5135e4099..d198b9e19 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -72,8 +72,8 @@ $labels['jan'] = 'ژان';
 $labels['feb'] = 'فور';
 $labels['mar'] = 'مار';
 $labels['apr'] = 'آور';
-$labels['may'] = 'می';
-$labels['longmay'] = 'می';
+$labels['may'] = 'مه';
+$labels['longmay'] = 'مه';
 $labels['jun'] = 'ژون';
 $labels['jul'] = 'ژوی';
 $labels['aug'] = 'اوت';
@@ -134,6 +134,7 @@ $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
 $labels['deleted'] = 'حذف شده';
+$labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
 $labels['filter'] = 'صافی';
 $labels['list'] = 'فهرست';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'کل پیغام';
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
 $labels['editasnew'] = 'ویرایش به عنوان جدید';
-$labels['savemessage'] = 'ذخیره به عنوان پیش‌نویس';
+$labels['send'] = 'ارسال';
 $labels['sendmessage'] = 'ارسال پیغام';
+$labels['savemessage'] = 'ذخیره به عنوان پیش‌نویس';
 $labels['addattachment'] = 'پیوست کردن یک پرونده';
 $labels['charset'] = 'مجموعه‌نمایه';
 $labels['editortype'] = 'نوع ویرایش‌گر';
@@ -198,6 +200,8 @@ $labels['nosubject'] = '(بدون موضوع)';
 $labels['showimages'] = 'نمایش عکس‌ها';
 $labels['alwaysshow'] = 'همیشه عکس‌های دریافتی از $sender را نمایش داده شود';
 $labels['isdraft'] = 'این یک پیغام پیش‌نویس است.';
+$labels['andnmore'] = '$nr بیشتر...';
+$labels['togglemoreheaders'] = 'نمایش سربرگ‌های بیشتر پیغام';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'ذخیره پیغام ارسالی در';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'وارد کردن تماس‌ها';
 $labels['importfromfile'] = 'وارد کردن از پرونده‌ی:';
 $labels['importtarget'] = 'افزودن تماس‌های جدید به دفتر نشانی:';
 $labels['importreplace'] = 'جایگیزینی کامل دفتر نشانی';
-$labels['importtext'] = 'شما می‌توانید اطلاعات تماس‌ها را به دفتر نشانی موجود منتقل کنید. <br/>  ما در حال حاضر امکان انتقال آدرس‌ها را با فرمت <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> برای شما فراهم نموده‌ایم.';
 $labels['done'] = 'انجام شد';
 $labels['settingsfor'] = 'تنظیمات برای';
 $labels['about'] = 'درباره';
@@ -350,7 +353,6 @@ $labels['always'] = 'همواره';
 $labels['showinlineimages'] = 'نمایش عکس‌های پیوست شده در پایین پیغام';
 $labels['autosavedraft'] = 'ذخیره‌ی خودکار پیش‌نویس';
 $labels['everynminutes'] = 'در هر $n دقیقه';
-$labels['keepalive'] = 'بررسی پیغام جدید در';
 $labels['never'] = 'هرگز';
 $labels['immediately'] = 'بلافاصله';
 $labels['messagesdisplaying'] = 'نمایش دادن پیغام‌ها';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 9d3cb05e0..c64662dd5 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
 */
 
@@ -169,8 +169,8 @@ $labels['msgtext'] = 'Koko viesti';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
 $labels['editasnew'] = 'Muokkaa uutena';
-$labels['savemessage'] = 'Tallenna tämä luonnos';
 $labels['sendmessage'] = 'Lähetä viesti';
+$labels['savemessage'] = 'Tallenna tämä luonnos';
 $labels['addattachment'] = 'Liitetiedosto';
 $labels['charset'] = 'Merkistö';
 $labels['editortype'] = 'Editorin tyyppi';
@@ -298,7 +298,6 @@ $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
 $labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
-$labels['importtext'] = 'Voit lähettää yhteystietoja muista osoitekirjoistna.Kontaktien tuomine on hetkellä mahdollista vCard-muodossa.';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Asetukset';
 $labels['about'] = 'Tietoja';
@@ -350,7 +349,6 @@ $labels['always'] = 'aina';
 $labels['showinlineimages'] = 'Näytä liitekuvat viestin jälkeen';
 $labels['autosavedraft'] = 'Tallenna luonnos automaattisesti';
 $labels['everynminutes'] = 'joka $n. minuutti';
-$labels['keepalive'] = 'Tarkasta uudet viestit';
 $labels['never'] = 'ei koskaan';
 $labels['immediately'] = 'välittömästi';
 $labels['messagesdisplaying'] = 'Viestien näyttäminen';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 13a31ba50..38d5a63d8 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Baptiste Darthenay <bapdarth@yahoo.fr>                        |
+ | Author: Penegal                                                       |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
 $labels['unanswered'] = 'Non répondu';
 $labels['deleted'] = 'Supprimé';
+$labels['undeleted'] = 'Non supprimé';
 $labels['invert'] = 'Inverser';
 $labels['filter'] = 'Filtre';
 $labels['list'] = 'Lister';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Message entier';
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
 $labels['editasnew'] = 'Éditer en tant que nouveau message';
-$labels['savemessage'] = 'Enregistrer';
+$labels['send'] = 'Envoyer';
 $labels['sendmessage'] = 'Envoyer';
+$labels['savemessage'] = 'Enregistrer';
 $labels['addattachment'] = 'Joindre un fichier';
 $labels['charset'] = 'Encodage';
 $labels['editortype'] = 'Type d\'éditeur';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(pas de sujet)';
 $labels['showimages'] = 'Afficher les images';
 $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
 $labels['isdraft'] = 'Ceci est un brouillon.';
+$labels['andnmore'] = 'Plus de $nr...';
+$labels['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';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importer les contacts';
 $labels['importfromfile'] = 'Importer depuis un fichier :';
 $labels['importtarget'] = 'Ajouter de nouveaux contact au carnet d’adresse :';
 $labels['importreplace'] = 'Remplacer le carnet d\'adresse entier';
-$labels['importtext'] = 'Vous pouvez envoyer des contacts depuis un carnet d\'adresse existant. Nous supportons actuellement l\'importation d\'adresses au format vCard.';
 $labels['done'] = 'Terminé';
 $labels['settingsfor'] = 'Paramètres pour';
 $labels['about'] = 'A propos';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'Fuseau horaire';
 $labels['pagesize'] = 'Nombre de lignes par page';
 $labels['signature'] = 'Signature';
 $labels['dstactive'] = 'Heure d\'été';
+$labels['showinextwin'] = 'Ouvrir le message dans une nouvelle fenêtre';
+$labels['composeextwin'] = 'Écrire dans une nouvelle fenêtre';
 $labels['htmleditor'] = 'Composer un message au format HTML';
 $labels['htmlonreply'] = 'en réponse aux messages HTML uniquement';
+$labels['htmlonreplyandforward'] = 'Transférer ou répondre au message HTML';
 $labels['htmlsignature'] = 'Signature HTML';
 $labels['previewpane'] = 'Afficher le panneau d\'aperçu';
 $labels['skin'] = 'Thème de l\'interface';
@@ -350,7 +357,6 @@ $labels['always'] = 'toujours';
 $labels['showinlineimages'] = 'Afficher les images attachées après le message';
 $labels['autosavedraft'] = 'Enregistrement automatique des brouillons';
 $labels['everynminutes'] = 'toutes les $n minute(s)';
-$labels['keepalive'] = 'Chercher les nouveaux messages';
 $labels['never'] = 'jamais';
 $labels['immediately'] = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
@@ -372,6 +378,7 @@ $labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'Nouveau Message';
 $labels['signatureoptions'] = 'Options pour la signature';
 $labels['whenreplying'] = 'En répondant';
+$labels['replyempty'] = 'Ne pas citer le message original';
 $labels['replytopposting'] = 'commencer le nouveau message au-dessus de l\'original';
 $labels['replybottomposting'] = 'commencer le nouveau message en-dessous de l\'original';
 $labels['replyremovesignature'] = 'En répondant, supprimer la signature d\'origine du message';
@@ -397,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignorer les mots avec des nombres';
 $labels['spellcheckignorecaps'] = 'Ignorer les mots entièrement en majuscule';
 $labels['addtodict'] = 'Ajouter au dictionnaire';
 $labels['mailtoprotohandler'] = 'Enregistrer le gestionnaire de protocole pour les liens mailto:';
+$labels['forwardmode'] = 'Transfert des messages';
+$labels['inline'] = 'dans le corps';
+$labels['asattachment'] = 'en pièce jointe';
 $labels['folder'] = 'Dossier';
 $labels['foldername'] = 'Nom du dossier';
 $labels['subscribed'] = 'Abonné';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 1cd0f7823..3566580bd 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jibec <jb.holcroft@gmail.com>                                 |
+ | Author: Anthony Prades <toony.github@chezouam.net>                    |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $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['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['mailboxempty'] = 'La boîte aux lettres est vide.';
@@ -78,7 +79,7 @@ $messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous ab
 $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.';
+$messages['searchsuccessful'] = '$nr messages trouvés';
 $messages['contactsearchsuccessful'] = '$nr contact(s) trouvé(s).';
 $messages['searchnomatch'] = 'La recherche ne donne aucun résultat';
 $messages['searching'] = 'En cours de recherche...';
@@ -114,8 +115,8 @@ $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['nogroupassignmentschanged'] = 'Appartenance aux groupes inchangée.';
 $messages['importwait'] = 'Importation, veuillez patienter...';
-$messages['importerror'] = 'Importation échouée ! Le fichier envoyé n\'est pas un fichier vCard valide.';
 $messages['importconfirm'] = '<b>$inserted contacts importés avec succès, $skipped entrées existantes ignorées</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>$skipped entrée(s) déjà existante(s)</b>';
 $messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index b312ddcc5..14a5cd1b4 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -114,8 +113,8 @@ $labels['unknown'] = 'gan aithne';
 $labels['unlimited'] = 'gan teorainn';
 $labels['quicksearch'] = 'Mearcuardaigh';
 $labels['resetsearch'] = 'Athshocraigh an cuardach';
-$labels['savemessage'] = 'Sábháil an dréachta seo';
 $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';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 5e8c2a6f8..976590ba8 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Xosé <Unknown>                                               |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -167,8 +166,8 @@ $labels['msgtext'] = 'Mensaxe enteira';
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
 $labels['editasnew'] = 'Editar como nova';
-$labels['savemessage'] = 'Gardar a mensaxe como borrador';
 $labels['sendmessage'] = 'Enviar a mensaxe agora';
+$labels['savemessage'] = 'Gardar a mensaxe como borrador';
 $labels['addattachment'] = 'Anexar un ficheiro';
 $labels['charset'] = 'Codificación';
 $labels['editortype'] = 'Tipo de editor';
@@ -293,7 +292,6 @@ $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
 $labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituír completamente o caderno de enderezos';
-$labels['importtext'] = 'Pode cargar contactos desde un caderno de enderezos xa existente.<br/>Polo de agora pódense importar enderezos usando o formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>';
 $labels['done'] = 'Rematado';
 $labels['settingsfor'] = 'Axustes de';
 $labels['about'] = 'Acerca de';
@@ -344,7 +342,6 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Amosar as imaxes anexas baixo a mensaxe';
 $labels['autosavedraft'] = 'Gardar borrador automáticamente';
 $labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['keepalive'] = 'Procurar novas mensaxes';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualización das mensaxes';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 1d8916ef1..22a163cd6 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
 $labels['unanswered'] = 'לא נענה';
 $labels['deleted'] = 'נמחק';
+$labels['undeleted'] = 'לא נמחק';
 $labels['invert'] = 'היפוך הסימון';
 $labels['filter'] = 'סינון';
 $labels['list'] = 'רשימה';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'כל ההודעה';
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
 $labels['editasnew'] = 'עריכת ההודעה כחדשה';
-$labels['savemessage'] = 'שמירת טיוטה';
+$labels['send'] = 'שלח';
 $labels['sendmessage'] = 'משלוח מיידי';
+$labels['savemessage'] = 'שמירת טיוטה';
 $labels['addattachment'] = 'צירוף קובץ';
 $labels['charset'] = 'קידוד';
 $labels['editortype'] = 'סוג עורך';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(ללא נושא)';
 $labels['showimages'] = 'הצגת תמונות';
 $labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת';
 $labels['isdraft'] = 'זו טיוטה של הודעה';
+$labels['andnmore'] = 'עוד  $nr';
+$labels['togglemoreheaders'] = 'הראה נתוני מערכת נוספים של ההודעה';
+$labels['togglefullheaders'] = 'הראה / בטל צפיה בנתוני מערכת של ההודעה';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ללא עיצוב';
 $labels['savesentmessagein'] = 'היכן לשמור ההודעה?';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'ייבוא אנשי קשר';
 $labels['importfromfile'] = 'ייבוא מקובץ';
 $labels['importtarget'] = 'הוספת אנשי קשר לספר הכתובות';
 $labels['importreplace'] = 'החלפת כל פנקס הכתובות';
-$labels['importtext'] = '<a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  ניתן לייבא אנשי קשר מפנקס כתובות קיים.  אנו תומכים בפורמט';
 $labels['done'] = 'בוצע';
 $labels['settingsfor'] = 'הגדרות עבור';
 $labels['about'] = 'אודות';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'איזור זמן';
 $labels['pagesize'] = 'מספר שורות בדף';
 $labels['signature'] = 'חתימה';
 $labels['dstactive'] = 'שעון קיץ';
+$labels['showinextwin'] = 'צפיה בהודעה בחלון חדש';
+$labels['composeextwin'] = 'יצירת הודעה בחלון חדש';
 $labels['htmleditor'] = 'יצירת הודעה מעוצבת';
 $labels['htmlonreply'] = 'רק במענה להודעת HTML';
+$labels['htmlonreplyandforward'] = 'להעביר או להשיב להודעה שהגיעה בפורמט HTML';
 $labels['htmlsignature'] = 'חתימה מעוצבת';
 $labels['previewpane'] = 'תצוגה מוקדמת';
 $labels['skin'] = 'ערכת מראה';
@@ -350,7 +357,6 @@ $labels['always'] = 'תמיד';
 $labels['showinlineimages'] = 'הצגת תמונות מצורפות בתחתית ההודעה';
 $labels['autosavedraft'] = 'שמירה אוטומטית של טיוטה';
 $labels['everynminutes'] = 'כל $n דקות';
-$labels['keepalive'] = 'בדיקת הגעה של הודעות חדשות';
 $labels['never'] = 'אף פעם';
 $labels['immediately'] = 'מיידית';
 $labels['messagesdisplaying'] = 'הצגת הודעות';
@@ -372,6 +378,7 @@ $labels['maintenance'] = 'תחזוקה';
 $labels['newmessage'] = 'הודעה חדשה';
 $labels['signatureoptions'] = 'אפשרויות לשיבוץ חתימה';
 $labels['whenreplying'] = 'כאשר עונים';
+$labels['replyempty'] = 'לא לצטט הודעה מקורית';
 $labels['replytopposting'] = 'הודעה חדשה תתחיל מעל ההודעה המקורית';
 $labels['replybottomposting'] = 'הודעה חדשה תתחיל מתחת להודעה המקורית';
 $labels['replyremovesignature'] = 'החתימה תוסר מההודעה המקורית במענה להודעה';
@@ -397,6 +404,9 @@ $labels['spellcheckignorenums'] = 'התעלמות ממילים המכילות מ
 $labels['spellcheckignorecaps'] = 'התעלמות ממילים עם אותציות ראשיות';
 $labels['addtodict'] = 'הוספה למילון';
 $labels['mailtoprotohandler'] = 'קביעת הפרוטוקול לטיפול בקישור מסוג  mailto:links';
+$labels['forwardmode'] = 'הפנית הודעות';
+$labels['inline'] = 'חלק מההודעה';
+$labels['asattachment'] = 'כצרופה';
 $labels['folder'] = 'תיק';
 $labels['foldername'] = 'שם תיק';
 $labels['subscribed'] = 'מנוי';
@@ -420,6 +430,7 @@ $labels['sortby'] = 'מיון לפי';
 $labels['sortasc'] = 'מיון בסדר עולה';
 $labels['sortdesc'] = 'מיון בסדר יורד';
 $labels['undo'] = 'ביטול שינוי';
+$labels['installedplugins'] = 'תוספים מותקנים';
 $labels['plugin'] = 'תוסף תוכנה';
 $labels['version'] = 'גירסה';
 $labels['source'] = 'מקור';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 35e03cf32..4d669b462 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'תם הזמן המוקצב לבקשה';
 $messages['errorreadonly'] = 'לא ניתן לבצע הפעולה כי התיק ניתן לקריאה בלבד';
 $messages['errornoperm'] = 'לא ניתן לבצע הפעולה כי אין הרשאה לבצעה';
 $messages['invalidrequest'] = 'בקשה לא חוקית. המידע לא נשמר';
+$messages['invalidhost'] = 'שם שרת לא חוקי';
 $messages['nomessagesfound'] = 'לא נמצאו הודעות בתיבה זו';
 $messages['loggedout'] = 'הקשר הסתיים. להתראות!';
 $messages['mailboxempty'] = 'רשימת ההודעות ריקה';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'נא לבחור קובץ לייבוא';
 $messages['addresswriterror'] = 'פנקס הכתובות שנבחר אינו ניתן לכתיבה';
 $messages['contactaddedtogroup'] = 'אנשי הקשר נוספו בהצלחה לקבוצה';
 $messages['contactremovedfromgroup'] = 'אנשי הקשר הוסרו בהצלחה מהקבוצה';
+$messages['nogroupassignmentschanged'] = 'לא השתנו הגדרות קבוצה';
 $messages['importwait'] = 'ייבוא, נא להמתין..';
-$messages['importerror'] = 'חוקי vCard הייבוא נכשל כי הקובץ אינו בפורמט';
 $messages['importconfirm'] = '<b>יובאו $inserted אנשי קשר, $skipped היו קיימים </b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>  דילוג של $skipped נתונים קיימים <b>';
 $messages['opnotpermitted'] = 'פעולה אסורה!';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index fb068b443..74e4b74cd 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vibhav Pant <vibhavp@gmail.com>                               |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -115,8 +114,8 @@ $labels['unknown'] = 'अज्ञात';
 $labels['unlimited'] = 'असीम';
 $labels['quicksearch'] = 'तेज़ खोज';
 $labels['resetsearch'] = 'खोज खाली करें';
-$labels['savemessage'] = 'ड्राफ़ट सहेजें';
 $labels['sendmessage'] = 'मेल भेजें';
+$labels['savemessage'] = 'ड्राफ़ट सहेजें';
 $labels['addattachment'] = 'फ़ाईल जोडें';
 $labels['charset'] = 'कैरेक्टर सैट';
 $labels['editortype'] = 'सम्पादक प्राकार';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 74ef41955..5ea86d96a 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: gogo <trebelnik2@gmail.com>                                   |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
 */
 
@@ -168,8 +168,8 @@ $labels['msgtext'] = 'Cijela poruka';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['editasnew'] = 'Uredi kao novo';
-$labels['savemessage'] = 'Spremi u \'Predlošci\'';
 $labels['sendmessage'] = 'Pošalji poruku';
+$labels['savemessage'] = 'Spremi u \'Predlošci\'';
 $labels['addattachment'] = 'Priloži datoteku';
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Tip editora';
@@ -295,7 +295,6 @@ $labels['importcontacts'] = 'Uvoz kontakta';
 $labels['importfromfile'] = 'Uvezi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove kontakte u imenik:';
 $labels['importreplace'] = 'Prepiši cijeli adresar';
-$labels['importtext'] = 'Možete prebaciti kontakte iz postojećeg adresara.<br/>Trenutno podržavamo uvozenje adresa iz <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formata.';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Postavke za';
 $labels['about'] = 'O programu';
@@ -346,7 +345,6 @@ $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži slike ispod poruke';
 $labels['autosavedraft'] = 'Automatski spremi draft';
 $labels['everynminutes'] = 'svakih $n minuta';
-$labels['keepalive'] = 'Provjeri nove poruke';
 $labels['never'] = 'nikada';
 $labels['immediately'] = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index e3d79d5dd..b2d4c08b2 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
 $labels['unanswered'] = 'Megválaszolatlan';
 $labels['deleted'] = 'Törölt';
+$labels['undeleted'] = 'Nem lett törölve';
 $labels['invert'] = 'Invertálás';
 $labels['filter'] = 'Szűrés';
 $labels['list'] = 'Lista';
@@ -169,8 +170,8 @@ $labels['msgtext'] = 'Teljes üzenet';
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
 $labels['editasnew'] = 'Szerkesztés újként';
-$labels['savemessage'] = 'Vázlat mentése';
 $labels['sendmessage'] = 'Üzenet küldése';
+$labels['savemessage'] = 'Vázlat mentése';
 $labels['addattachment'] = 'Fájl csatolása';
 $labels['charset'] = 'Karakterkészlet';
 $labels['editortype'] = 'Szerkesztő típusa';
@@ -198,6 +199,9 @@ $labels['nosubject'] = '(nincs tárgy)';
 $labels['showimages'] = 'Képek megjelenítése';
 $labels['alwaysshow'] = 'Képek megjelenítése mindig, ha a feladó $sender';
 $labels['isdraft'] = 'TRANSLATE!';
+$labels['andnmore'] = 'további $nr...';
+$labels['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';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'Kapcsolatok importálása';
 $labels['importfromfile'] = 'Importálás fájlból:';
 $labels['importtarget'] = 'Kapcsolatok hozzáadása a címjegyzékhez:';
 $labels['importreplace'] = 'A teljes címjegyzék cseréje';
-$labels['importtext'] = 'Feltölthet kapcsolatokat egy már létező címjegyzékből. <br/> Jelenleg a <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  formátumú adatok importálása támogatott.';
 $labels['done'] = 'Kész';
 $labels['settingsfor'] = 'Beállítás';
 $labels['about'] = 'Névjegy';
@@ -325,6 +328,7 @@ $labels['signature'] = 'Aláírás';
 $labels['dstactive'] = 'Nyári időszámítás';
 $labels['htmleditor'] = 'HTML üzenet írása';
 $labels['htmlonreply'] = 'csak HTML üzenetre válaszolva';
+$labels['htmlonreplyandforward'] = 'HTML üzenet továbbításakor vagy az arra való válaszoláskor';
 $labels['htmlsignature'] = 'HTML aláírás';
 $labels['previewpane'] = 'Előnézeti kép';
 $labels['skin'] = 'Kinézet';
@@ -350,7 +354,6 @@ $labels['always'] = 'mindig';
 $labels['showinlineimages'] = 'Csatolt képek megjelenítése az üzenet alatt';
 $labels['autosavedraft'] = 'Piszkozat automatikus mentése';
 $labels['everynminutes'] = 'minden $n percben';
-$labels['keepalive'] = 'Új üzenetek keresése';
 $labels['never'] = 'soha';
 $labels['immediately'] = 'azonnal';
 $labels['messagesdisplaying'] = 'Üzenetek megjelenítése';
@@ -372,6 +375,7 @@ $labels['maintenance'] = 'Karbantartás';
 $labels['newmessage'] = 'Új üzenet';
 $labels['signatureoptions'] = 'Aláírás beállításai';
 $labels['whenreplying'] = 'Válasznál';
+$labels['replyempty'] = 'ne idézze az eredeti üzenetet';
 $labels['replytopposting'] = 'üzenet írása az eredeti felett';
 $labels['replybottomposting'] = 'üzenet írása az eredeti alatt';
 $labels['replyremovesignature'] = 'Válasznál az eredeti aláírás eltávolítása';
@@ -397,6 +401,9 @@ $labels['spellcheckignorenums'] = 'Számot tartalmazó szavak kihagyása';
 $labels['spellcheckignorecaps'] = 'Csak nagybetűt tartalmazó szavak kihagyása';
 $labels['addtodict'] = 'Hozzáadás a szótárhoz';
 $labels['mailtoprotohandler'] = 'Beállítás a mailto: linkek kezelőjeként';
+$labels['forwardmode'] = 'Üzenet továbbítás';
+$labels['inline'] = 'beágyazott';
+$labels['asattachment'] = 'csatolmányként';
 $labels['folder'] = 'Mappa';
 $labels['foldername'] = 'Mappa neve';
 $labels['subscribed'] = 'Feliratkozva';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 4f101b5e0..aaf2968ce 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Németh András <narzym@hotmail.com>                          |
+ | Author: bela                                                          |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'A kérés túllépte az időkorlátot';
 $messages['errorreadonly'] = 'A műveletet nem sikerült végrehajtani. A mappa írásvédett.';
 $messages['errornoperm'] = 'A műveletet nem sikerült végrehajtani. Hozzáférés megtagadva.';
 $messages['invalidrequest'] = 'Érvénytelen kérés! Az adatok nem lettek elmentve.';
+$messages['invalidhost'] = 'Hibás szerver hoszt név';
 $messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
 $messages['loggedout'] = 'Sikeres kijelentkezés. Viszontlátásra!';
 $messages['mailboxempty'] = 'A fiók üres';
@@ -115,7 +116,6 @@ $messages['addresswriterror'] = 'A kiválasztott címjegyzék nem írható';
 $messages['contactaddedtogroup'] = 'A kapcsolat hozzáadása a csoporthoz sikeresen megtörtént';
 $messages['contactremovedfromgroup'] = 'A kapcsolat törlése a csoportból sikeresen megtörtént';
 $messages['importwait'] = 'Importálás folyamatban, kérem várjon...';
-$messages['importerror'] = 'Az importálás sikertelen! A feltöltött állomány nem egy érvényes vCard fájl.';
 $messages['importconfirm'] = '<b>Sikeresen importálásra került $inserted kapcsolat, kihagyva $skipped már létező bejegyzés</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Kihagyva $skipped már létező bejegyzés</b>';
 $messages['opnotpermitted'] = 'A művelet nem megengedett!';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 8d3f2dcdc..56bf946d9 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
 */
 
@@ -172,8 +172,8 @@ $labels['msgtext'] = 'Ողջ հաղորդագրությունը';
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
 $labels['editasnew'] = 'Խմբագրել որպես նոր';
-$labels['savemessage'] = 'Հիշել որպես սևագիր';
 $labels['sendmessage'] = 'Ուղարկել';
+$labels['savemessage'] = 'Հիշել որպես սևագիր';
 $labels['addattachment'] = 'Կցել ֆայլ';
 $labels['charset'] = 'Տառաշար';
 $labels['editortype'] = 'Խմբագրի տիպը';
@@ -301,7 +301,6 @@ $labels['importcontacts'] = 'Ներկրել հասցեներ';
 $labels['importfromfile'] = 'Ներկրել ֆայլից';
 $labels['importtarget'] = 'Ավելացնել նոր կապորդներ հասցեագրքում';
 $labels['importreplace'] = 'Փոխել ողջ հասցեագիրքը';
-$labels['importtext'] = 'Դուք կարող եք ներկրել նոր հասցեներ առկա հասցեագրքից։ Համակարգը ընդունում է հասցեների ներկրումը <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> չափաձևով։';
 $labels['done'] = 'Ավարտված է';
 $labels['settingsfor'] = 'Նախասիրություններ';
 $labels['about'] = 'Նկարագիր';
@@ -350,7 +349,6 @@ $labels['always'] = 'միշտ';
 $labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
 $labels['autosavedraft'] = 'Սևագրի ավտոմատ գրանցում';
 $labels['everynminutes'] = 'ամեն $n րոպեն';
-$labels['keepalive'] = 'Ստուգել նոր նամակները';
 $labels['never'] = 'երբեք';
 $labels['immediately'] = 'անմիջապես';
 $labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index e3148ecc5..cae533fe1 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -2,16 +2,15 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                            |
+ | localization/ia/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
+ | Author: Emilio Sepulveda                                              |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -120,8 +119,8 @@ $labels['resetsearch'] = 'Reinitialisar cerca';
 $labels['msgtext'] = 'Message complete';
 $labels['openinextwin'] = 'Aperir in nove fenestra';
 $labels['editasnew'] = 'Modificar como nove';
-$labels['savemessage'] = 'Salveguardar como version provisori';
 $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';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index bda6e8990..ce388581e 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = 'Seluruh pesan';
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
 $labels['editasnew'] = 'Sunting sebagai pesan baru';
-$labels['savemessage'] = 'Simpan konsep surat  ini';
 $labels['sendmessage'] = 'Kirim pesan sekarang';
+$labels['savemessage'] = 'Simpan konsep surat  ini';
 $labels['addattachment'] = 'Sisipkan sebuah berkas';
 $labels['charset'] = 'Set karakter';
 $labels['editortype'] = 'Tipe penyunting';
@@ -299,7 +298,6 @@ $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
 $labels['importtarget'] = 'Tambahkan kontak baru ke buku alamat:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
-$labels['importtext'] = 'Anda bisa mengunggah kontak dari buku alamat yang sudah ada.<br/>Kami kebetulan mendukung pengimportan alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Selesai';
 $labels['settingsfor'] = 'Pengaturan untuk';
 $labels['about'] = 'Informasi program';
@@ -351,7 +349,6 @@ $labels['always'] = 'selalu';
 $labels['showinlineimages'] = 'Tampilkan gambar terlampir dibawah pesan';
 $labels['autosavedraft'] = 'Otomatis menyimpan pesan tertunda';
 $labels['everynminutes'] = 'setiap $n menit';
-$labels['keepalive'] = 'Periksa pesan baru saat';
 $labels['never'] = 'tidak pernah';
 $labels['immediately'] = 'secepatnya';
 $labels['messagesdisplaying'] = 'Penampilan Pesan';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 6f0c878b2..d768050fe 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jóhannes Birgir Jensson <joi@betra.is>                       |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -169,8 +168,8 @@ $labels['msgtext'] = 'Allt skeytið';
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
 $labels['editasnew'] = 'Breyta sem nýju';
-$labels['savemessage'] = 'Vista drög';
 $labels['sendmessage'] = 'Senda skeytið núna';
+$labels['savemessage'] = 'Vista drög';
 $labels['addattachment'] = 'Hengja við';
 $labels['charset'] = 'Stafasett';
 $labels['editortype'] = 'Gerð ritils';
@@ -296,7 +295,6 @@ $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['importtext'] = 'Þú getur flutt inn nafnspjöld frá núverandi netfangaskrá. <br/>Nú styðjum við innflutning á netföngum á <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formi.';
 $labels['done'] = 'Búið';
 $labels['settingsfor'] = 'Stillingar fyrir';
 $labels['about'] = 'Um forritið';
@@ -347,7 +345,6 @@ $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['keepalive'] = 'Athuga ný skeyti á';
 $labels['never'] = 'aldrei';
 $labels['immediately'] = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 61b48b0cc..3d78df5c7 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
 $labels['unanswered'] = 'Senza risposta';
 $labels['deleted'] = 'Cancellato';
+$labels['undeleted'] = 'Non eliminato';
 $labels['invert'] = 'Inverti';
 $labels['filter'] = 'Filtra';
 $labels['list'] = 'Elenco';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Intero messaggio';
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
 $labels['editasnew'] = 'Modifica come nuovo';
-$labels['savemessage'] = 'Salva come bozza';
+$labels['send'] = 'Invia';
 $labels['sendmessage'] = 'Invia il messaggio adesso';
+$labels['savemessage'] = 'Salva come bozza';
 $labels['addattachment'] = 'Allega un file';
 $labels['charset'] = 'Set di caratteri';
 $labels['editortype'] = 'Tipo editor';
@@ -198,6 +200,8 @@ $labels['nosubject'] = '(nessun oggetto)';
 $labels['showimages'] = 'Visualizza immagini';
 $labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
 $labels['isdraft'] = 'Questa è una bozza.';
+$labels['andnmore'] = 'ancora $nr...';
+$labels['togglemoreheaders'] = 'Mostra più intestazioni dei messaggi';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testo semplice';
 $labels['savesentmessagein'] = 'Salva i messaggi inviati in';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'Importa contatti';
 $labels['importfromfile'] = 'Importa da file:';
 $labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
-$labels['importtext'] = 'Puoi caricare i contatti da una rubrica esistente. Al momento è supportata l\'importazione dei contatti dal formato vCard.';
 $labels['done'] = 'Fatto';
 $labels['settingsfor'] = 'Impostazioni per';
 $labels['about'] = 'Informazioni';
@@ -323,9 +326,11 @@ $labels['timezone'] = 'Fuso orario';
 $labels['pagesize'] = 'Righe per pagina';
 $labels['signature'] = 'Firma';
 $labels['dstactive'] = 'Gestione ora legale';
-$labels['composeextwin'] = 'Componi in nuova finestra';
+$labels['showinextwin'] = 'Apri il messaggio in una nuova finestra';
+$labels['composeextwin'] = 'Crea messaggio in una nuova finestra';
 $labels['htmleditor'] = 'Scrivi i messaggi in HTML';
 $labels['htmlonreply'] = 'solo in risposta a messaggi HTML';
+$labels['htmlonreplyandforward'] = 'su inoltro o risposta a messaggi HTML';
 $labels['htmlsignature'] = 'Firma in HTML';
 $labels['previewpane'] = 'Mostra l\'anteprima';
 $labels['skin'] = 'Tema interfaccia';
@@ -351,7 +356,6 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra immagini allegate sotto il messaggio';
 $labels['autosavedraft'] = 'Salva le bozze automaticamente';
 $labels['everynminutes'] = 'ogni $n minuto(i)';
-$labels['keepalive'] = 'Controlla la presenza di nuovi messaggi';
 $labels['never'] = 'mai';
 $labels['immediately'] = 'immediatamente';
 $labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
@@ -373,6 +377,7 @@ $labels['maintenance'] = 'Manutenzione';
 $labels['newmessage'] = 'Nuovo Messaggio';
 $labels['signatureoptions'] = 'Opzioni firma';
 $labels['whenreplying'] = 'Quando rispondi';
+$labels['replyempty'] = 'non citare il messaggio originale';
 $labels['replytopposting'] = 'inizia il nuovo messaggio sopra quello originale';
 $labels['replybottomposting'] = 'inizia il nuovo messaggio sotto quello originale';
 $labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messaggio originale';
@@ -398,6 +403,9 @@ $labels['spellcheckignorenums'] = 'Ignora le parole contenenti numeri';
 $labels['spellcheckignorecaps'] = 'Ignora le parole con tutte le lettere maiuscole';
 $labels['addtodict'] = 'Aggiungi al dizionario';
 $labels['mailtoprotohandler'] = 'Registra gestore per mailto:';
+$labels['forwardmode'] = 'Inoltro messaggi';
+$labels['inline'] = 'In linea';
+$labels['asattachment'] = 'come allegato';
 $labels['folder'] = 'Cartella';
 $labels['foldername'] = 'Nome cartella';
 $labels['subscribed'] = 'Sottoscritta';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 1dd007359..b1b972676 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Richiesta scaduta';
 $messages['errorreadonly'] = 'Impossibile eseguire l\'operazione. Cartella in sola lettura';
 $messages['errornoperm'] = 'Impossibile eseguire l\'operazione. Permesso negato';
 $messages['invalidrequest'] = 'Richiesta non valida! Nessun dato salvato.';
+$messages['invalidhost'] = 'Nome del server non valido.';
 $messages['nomessagesfound'] = 'Nessun messaggio trovato in questa cartella';
 $messages['loggedout'] = 'Sessione chiusa correttamente. Arrivederci!';
 $messages['mailboxempty'] = 'La casella è vuota';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Per favore, seleziona il file da caricare';
 $messages['addresswriterror'] = 'La rubrica selezionata non è scrivibile';
 $messages['contactaddedtogroup'] = 'Contatto aggiunto con successo al gruppo';
 $messages['contactremovedfromgroup'] = 'Contatto rimosso con successo dal gruppo';
+$messages['nogroupassignmentschanged'] = 'Nessun assegnamento del gruppo è stato cambiato.';
 $messages['importwait'] = 'Importazione in corso, attendere...';
-$messages['importerror'] = 'Importazione fallita! Il file caricato non è un file vCard valido.';
 $messages['importconfirm'] = '<b>$inserted contatti importati con successo</p>';
 $messages['importconfirmskipped'] = '<b>$skipped ignorati perché esistono già</b>';
 $messages['opnotpermitted'] = 'Operazione non consentita!';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 66a585e7f..34166cae8 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
 $labels['unanswered'] = '未返信';
 $labels['deleted'] = '削除済み';
+$labels['undeleted'] = '削除済みでない';
 $labels['invert'] = '反転';
 $labels['filter'] = 'フィルター';
 $labels['list'] = '一覧';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'メッセージ全体';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
 $labels['editasnew'] = '新しいメッセージとして編集';
-$labels['savemessage'] = '下書きとして保存';
+$labels['send'] = '送信';
 $labels['sendmessage'] = 'メッセージを送信';
+$labels['savemessage'] = '下書きとして保存';
 $labels['addattachment'] = 'ファイルを添付';
 $labels['charset'] = '文字セット';
 $labels['editortype'] = 'エディターの種類';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(件名なし)';
 $labels['showimages'] = '画像を表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
 $labels['isdraft'] = 'これは下書きのメッセージです。';
+$labels['andnmore'] = 'さらに$nr件...';
+$labels['togglemoreheaders'] = 'さらにメッセージのヘッダーを表示';
+$labels['togglefullheaders'] = 'メッセージヘッダーの生の表示と切り替え';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
 $labels['savesentmessagein'] = '送信したメッセージの保存先';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = '連絡先をインポート';
 $labels['importfromfile'] = 'ファイルからインポート';
 $labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
 $labels['importreplace'] = 'アドレス帳全体と置き換え';
-$labels['importtext'] = '既存のアドレス帳から連絡先をアップロードできます。現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 形式からのインポートに対応しています。';
 $labels['done'] = '完了';
 $labels['settingsfor'] = '次の設定:';
 $labels['about'] = 'このプログラムについて';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'タイムゾーン';
 $labels['pagesize'] = '1ページの表示件数';
 $labels['signature'] = '署名';
 $labels['dstactive'] = 'サマータイムを適用';
+$labels['showinextwin'] = '新しいウィンドウでメッセージを表示';
+$labels['composeextwin'] = '新しいウィンドウでメッセージを作成';
 $labels['htmleditor'] = '作成時にHTMLメッセージを使用';
 $labels['htmlonreply'] = '返信時にHTMLメッセージを使用';
+$labels['htmlonreplyandforward'] = '転送またはHTMLメッセージへの返信';
 $labels['htmlsignature'] = 'HTMLの署名';
 $labels['previewpane'] = 'プレビュー枠の表示';
 $labels['skin'] = 'インターフェイスのスキン';
@@ -350,7 +357,6 @@ $labels['always'] = '常時';
 $labels['showinlineimages'] = 'メッセージに添付された画像を下に表示';
 $labels['autosavedraft'] = '自動的に下書きを保存';
 $labels['everynminutes'] = '$n分毎';
-$labels['keepalive'] = '新着メッセージを確認する間隔';
 $labels['never'] = 'しない';
 $labels['immediately'] = '即時';
 $labels['messagesdisplaying'] = 'メッセージの表示';
@@ -372,6 +378,7 @@ $labels['maintenance'] = '保守';
 $labels['newmessage'] = '新しいメッセージ';
 $labels['signatureoptions'] = '署名の設定';
 $labels['whenreplying'] = '返信時の本文';
+$labels['replyempty'] = '元のメッセージを引用しない';
 $labels['replytopposting'] = '元のメッセージを引用した前に本文を作成';
 $labels['replybottomposting'] = '元のメッセージを引用した後に本文を作成';
 $labels['replyremovesignature'] = '返信時に元の署名をメッセージから削除';
@@ -397,6 +404,9 @@ $labels['spellcheckignorenums'] = '数字を含む単語を無視';
 $labels['spellcheckignorecaps'] = 'すべて大文字の単語を無視';
 $labels['addtodict'] = '辞書に追加';
 $labels['mailtoprotohandler'] = 'mailto: のリンクを扱うプロトコル処理の登録';
+$labels['forwardmode'] = 'メッセージの転送形式';
+$labels['inline'] = 'インライン';
+$labels['asattachment'] = '添付ファイル';
 $labels['folder'] = 'フォルダー';
 $labels['foldername'] = 'フォルダー名';
 $labels['subscribed'] = '購読済み';
@@ -420,6 +430,7 @@ $labels['sortby'] = '並べ替え';
 $labels['sortasc'] = '昇順で並べ替え';
 $labels['sortdesc'] = '降順で並べ替え';
 $labels['undo'] = '取り消し';
+$labels['installedplugins'] = 'インストールしているプラグイン';
 $labels['plugin'] = 'プラグイン';
 $labels['version'] = 'バージョン';
 $labels['source'] = 'ソース';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 81e6d4765..395f5e056 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'リクエストのタイムアウト';
 $messages['errorreadonly'] = '操作を実行できませんでした。フォルダーは読み込み専用です。';
 $messages['errornoperm'] = '操作を実行できませんでした。権限がありません。';
 $messages['invalidrequest'] = '不正なリクエストです!  データは保存していません。';
+$messages['invalidhost'] = '正しくないサーバー名です。';
 $messages['nomessagesfound'] = 'このフォルダーにはメッセージはありません。';
 $messages['loggedout'] = 'ログアウトしました。さようなら!';
 $messages['mailboxempty'] = 'メールボックスは空です。';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'アップロードするファイルを選択�
 $messages['addresswriterror'] = '選択したアドレス帳は書き込みできないアドレス帳です。';
 $messages['contactaddedtogroup'] = 'このグループに連絡先を追加しました。';
 $messages['contactremovedfromgroup'] = 'このグループから連絡先を削除しました。';
+$messages['nogroupassignmentschanged'] = 'グループの割り当てを変更しませんでした。';
 $messages['importwait'] = 'インポート中です。しばらくお待ちください...';
-$messages['importerror'] = 'インポートに失敗しました。アップロードしたファイルは不正なvCardファイルです。';
 $messages['importconfirm'] = '<b>$inserted件の連絡先をインポートしました。</b>';
 $messages['importconfirmskipped'] = '<b>$skipped件の既存する項目を飛ばした。</b>';
 $messages['opnotpermitted'] = '許可されていない操作です。';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index c963c988f..1bd9ccb3f 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -143,8 +142,8 @@ $labels['msgtext'] = 'ყველა შეტყობინება';
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
 $labels['editasnew'] = 'რედაქტირება როგორც ახლის';
-$labels['savemessage'] = 'დროებით შენახვა';
 $labels['sendmessage'] = 'შეტყობინების გაგზავნა';
+$labels['savemessage'] = 'დროებით შენახვა';
 $labels['addattachment'] = 'ფაილის ატვირთვა';
 $labels['charset'] = 'კოდირება';
 $labels['editortype'] = 'რედაქტორი';
@@ -244,7 +243,6 @@ $labels['import'] = 'შემოტანა';
 $labels['importcontacts'] = 'კონტაქტების შემოტანა';
 $labels['importfromfile'] = 'შემოტანა ფაილიდან:';
 $labels['importreplace'] = 'ჩაანაცვლეთ არსებული მისამართები';
-$labels['importtext'] = 'თქვენ შეგიძლიათ ატვირთოთ კონტაქტები აღნიშნული მისამართიდან. <br/> ჩვენ შეგვიძლია მივიღოთ მისამართები <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> მონაცემთა ფორმატში.';
 $labels['done'] = 'დასრულებულია';
 $labels['settingsfor'] = 'პარამეტრები';
 $labels['preferences'] = 'პარამეტრები';
@@ -290,7 +288,6 @@ $labels['always'] = 'ყოველთვის';
 $labels['showinlineimages'] = 'ატვირთული სურათები გამოაჩინე გზავნილის ქვემოთ';
 $labels['autosavedraft'] = 'ავტომატური შენახვა';
 $labels['everynminutes'] = 'ყოველ $n წუთში';
-$labels['keepalive'] = 'შეამოწმე ახალ შეტყობინებაზე';
 $labels['never'] = 'არასდროს';
 $labels['immediately'] = 'დაუყონებლივ';
 $labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 00ce9ab8b..7ae9631bd 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -158,8 +157,8 @@ $labels['msgtext'] = 'សំបុត្រទាំងមូល';
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
 $labels['editasnew'] = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
-$labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
 $labels['sendmessage'] = 'ផ្ញើសំបុត្រនេះ';
+$labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
 $labels['addattachment'] = 'ឯកសារភ្ជាប់';
 $labels['charset'] = 'ប្រភេទអក្សរ';
 $labels['editortype'] = 'ប្រភេទ Editor';
@@ -312,7 +311,6 @@ $labels['always'] = 'គ្រប់ពេល';
 $labels['showinlineimages'] = 'បង្ហាញរូបភាពនៅក្រោមអត្ថបទសំបុត្រ';
 $labels['autosavedraft'] = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
 $labels['everynminutes'] = 'រៀងរាល់ $n នាទី';
-$labels['keepalive'] = 'ត្រួតពិនិត្យរកមើលសំបុត្រថ្មីនៅ';
 $labels['never'] = 'មិនដែល';
 $labels['immediately'] = 'ភ្លាមៗ';
 $labels['messagesdisplaying'] = 'កំពុងបង្ហាញសំបុត្រ';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 01eabe910..8bdf96b1a 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -157,8 +157,8 @@ $labels['resetsearch'] = '찾기 리셋';
 $labels['msgtext'] = '전체 메시지';
 $labels['openinextwin'] = '새 창에서 열기';
 $labels['emlsave'] = '다운로드 (.eml)';
-$labels['savemessage'] = '드래프트 저장';
 $labels['sendmessage'] = '메일 지금 보냄';
+$labels['savemessage'] = '드래프트 저장';
 $labels['addattachment'] = '파일 첨부';
 $labels['charset'] = '문자셋';
 $labels['editortype'] = '편집기 형태';
@@ -280,7 +280,6 @@ $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
 $labels['importfromfile'] = '파일에서 가져오기';
 $labels['importreplace'] = '전체 주소록을 바꿈';
-$labels['importtext'] = '연락처들을 가지고 있는 주소록에서 가져올 수 있습니다.<br/> 현재는 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 포맷에서 가져오기를 지원합니다.';
 $labels['done'] = '완료';
 $labels['settingsfor'] = '설정';
 $labels['about'] = '이것은...';
@@ -330,7 +329,6 @@ $labels['always'] = '항상';
 $labels['showinlineimages'] = '메시지 아래에 첨부 이미지 보이기';
 $labels['autosavedraft'] = '드래프트 자동 저장';
 $labels['everynminutes'] = '$n 분마다';
-$labels['keepalive'] = '다음 간격마다 새 메시지 자동 체크';
 $labels['never'] = '하지 않음';
 $labels['immediately'] = '즉시';
 $labels['messagesdisplaying'] = '메시지 표시 중';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 093696587..a6de26f94 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -94,8 +93,8 @@ $labels['unknown'] = 'nayê zanîn';
 $labels['unlimited'] = 'bêsînor';
 $labels['quicksearch'] = 'Lêgerîna bilez';
 $labels['resetsearch'] = 'Lêgerînê reset bike';
-$labels['savemessage'] = 'Hilîne';
 $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';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index c1bdbcafb..039ac8581 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -21,7 +21,7 @@ $labels['server'] = 'Serveris';
 $labels['login'] = 'Prisijungti';
 $labels['logout'] = 'Atsijungti';
 $labels['mail'] = 'El. paštas';
-$labels['settings'] = 'Nustatymai';
+$labels['settings'] = 'Nuostatos';
 $labels['addressbook'] = 'Adresų knyga';
 $labels['inbox'] = 'Gauti laiškai';
 $labels['drafts'] = 'Juodraščiai';
@@ -169,8 +169,8 @@ $labels['msgtext'] = 'Visas laiškas';
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
 $labels['editasnew'] = 'Redaguoti kaip naują';
-$labels['savemessage'] = 'Išsaugoti šį juodraštį';
 $labels['sendmessage'] = 'Išsiųsti laiską';
+$labels['savemessage'] = 'Išsaugoti šį juodraštį';
 $labels['addattachment'] = 'Pridėti failą';
 $labels['charset'] = 'Koduotė';
 $labels['editortype'] = 'Laiško tipas';
@@ -298,7 +298,6 @@ $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['importtext'] = 'Jūs galite įkelti adresatus iš egzistuojančios adresų knygos.<br/>Šiuo metu galima importuoti adresus iš <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> tipo failų.';
 $labels['done'] = 'Baigta';
 $labels['settingsfor'] = 'Nuostatos';
 $labels['about'] = 'Apie';
@@ -350,7 +349,6 @@ $labels['always'] = 'visada';
 $labels['showinlineimages'] = 'Rodyti pridėtus paveikslėlius žemiau laiško';
 $labels['autosavedraft'] = 'Automatiškai įrašyti juodraščius';
 $labels['everynminutes'] = 'kas $n min.';
-$labels['keepalive'] = 'Tikrinti ar yra naujų laiškų';
 $labels['never'] = 'niekada';
 $labels['immediately'] = 'nedelsiant';
 $labels['messagesdisplaying'] = 'Laiškų rodymas';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index e324815ed..4c83528f6 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -161,8 +160,8 @@ $labels['msgtext'] = 'Vēstules tekstā';
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
 $labels['editasnew'] = 'rediģēt kā jaunu';
-$labels['savemessage'] = 'Saglabāt uzmetumu';
 $labels['sendmessage'] = 'Sūtīt vēstuli';
+$labels['savemessage'] = 'Saglabāt uzmetumu';
 $labels['addattachment'] = 'Pievienot failu';
 $labels['charset'] = 'Rakstzīmju kopa';
 $labels['editortype'] = 'Redaktora tips';
@@ -285,7 +284,6 @@ $labels['importcontacts'] = 'Importēt kontaktus';
 $labels['importfromfile'] = 'Importēt no faila:';
 $labels['importtarget'] = 'Pievienot jaunus kontaktus adrešu grāmatai';
 $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
-$labels['importtext'] = 'Jūst varat augšupielādēt kontaktus no citas adrešu grāmatas.<br/>Pašlaik ir atbalstīts adrešu imports no <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> datu formāta.';
 $labels['done'] = 'Pabeigts';
 $labels['settingsfor'] = 'Iestatījumi';
 $labels['about'] = 'Par';
@@ -336,7 +334,6 @@ $labels['always'] = 'vienmēr';
 $labels['showinlineimages'] = 'Rādīt pielikuma attēlus zem vēstules';
 $labels['autosavedraft'] = 'Automātiski saglabāt uzmetumu';
 $labels['everynminutes'] = 'ik pa $n minūti(ēm)';
-$labels['keepalive'] = 'Pārbaudīt vai nav jaunas vēstules';
 $labels['never'] = 'nekad';
 $labels['immediately'] = 'nekavējoties';
 $labels['messagesdisplaying'] = 'Vēstuļu attēlošana';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 75747b32f..81aa13927 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -130,8 +129,8 @@ $labels['msgtext'] = 'Цело писмо';
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
 $labels['editasnew'] = 'Уреди како ново';
-$labels['savemessage'] = 'Зачувај го писмото во Непратени';
 $labels['sendmessage'] = 'Испрати сега';
+$labels['savemessage'] = 'Зачувај го писмото во Непратени';
 $labels['addattachment'] = 'Приложи податотека';
 $labels['charset'] = 'Збир од знаци';
 $labels['editortype'] = 'Тип на уредник';
@@ -189,7 +188,6 @@ $labels['import'] = 'Увези';
 $labels['importcontacts'] = 'Увези контакти';
 $labels['importfromfile'] = 'Увези од податотека:';
 $labels['importreplace'] = 'Замени го целиот именик';
-$labels['importtext'] = 'Можете да приложите контакти од веќе постоечки именик.<br/>Во моментот поддржуваме увоз на адреси од <a href="http://mk.wikipedia.org/wiki/VCard">vCard</a> форматот.';
 $labels['done'] = 'Завршено';
 $labels['settingsfor'] = 'Нагодувања за';
 $labels['preferences'] = 'Нагодувања';
@@ -232,7 +230,6 @@ $labels['always'] = 'секогаш';
 $labels['showinlineimages'] = 'Прикажи приложени слики под писмото';
 $labels['autosavedraft'] = 'Авоматски зачувувај во Непратени';
 $labels['everynminutes'] = 'секои $n минути';
-$labels['keepalive'] = 'Проверувај за нови писма на';
 $labels['never'] = 'никогаш';
 $labels['messagesdisplaying'] = 'Прикажување на писма';
 $labels['messagescomposition'] = 'Пишување на писма';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index a16885d6c..0cab9c231 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_ML/labels.inc                                         |
+ | localization/ml_IN/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
@@ -134,8 +134,8 @@ $labels['quicksearch'] = 'പെട്ടെന്ന് തെരയു';
 $labels['msgtext'] = 'മുഴുവന്‍ സന്ദേശവും';
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
 $labels['editasnew'] = 'പുതിയതായി തിരുത്തുക';
-$labels['savemessage'] = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
 $labels['sendmessage'] = 'സന്ദേശം അയയ്ക്കുക';
+$labels['savemessage'] = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
 $labels['addattachment'] = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
 $labels['editortype'] = 'തിരുത്തല്‍ രീതി';
 $labels['originalmessage'] = 'യഥാര്‍ഥ സന്ദേശം';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 2dbf0f311..83e05001a 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -164,8 +163,8 @@ $labels['msgtext'] = 'संपूर्ण संदेश';
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
 $labels['editasnew'] = 'नवीन आहे असा संपादित करा';
-$labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
 $labels['sendmessage'] = 'आत्ता पाठवा';
+$labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
 $labels['addattachment'] = 'फाईल सोबत जोडा';
 $labels['charset'] = 'कॅरेक्टर सेट';
 $labels['editortype'] = 'संपादकाचा प्रकार';
@@ -272,7 +271,6 @@ $labels['importcontacts'] = 'पत्ते आयात करा';
 $labels['importfromfile'] = 'या फाईल मधून आयात करा';
 $labels['importtarget'] = 'नवीन पत्ता नोंदवहीत नोंदवा';
 $labels['importreplace'] = 'संपूर्ण पत्ता नोंदवही बदला';
-$labels['importtext'] = 'तुम्ही तुमच्याकडील पत्ता नोंदवहीतील पत्ते तुम्ही येथे घेऊ शकता.<br/>सध्या आम्ही या <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> प्रकारच्या वेगवेगळ्या नोंदवहीतील पत्ते घेऊ शकतो.';
 $labels['done'] = 'झाले';
 $labels['settingsfor'] = 'साठी सेटिंग्ज';
 $labels['about'] = 'च्या विषयी';
@@ -318,7 +316,6 @@ $labels['always'] = 'नेहमी';
 $labels['showinlineimages'] = 'सोबत जोडलेली चित्रे संदेशाच्या खाली दाखवा';
 $labels['autosavedraft'] = 'मसूदा आपोआप जतन करा';
 $labels['everynminutes'] = 'प्रत्येक $n मिनिटांनी';
-$labels['keepalive'] = 'वर नवे संदेश आले आहेत का ते पहा';
 $labels['never'] = 'कधीच नाही';
 $labels['immediately'] = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index d19239b67..51e5073b8 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: nawawi <Unknown>                                              |
+ | Author: nawawi                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = 'Keseluruhan mesej';
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
 $labels['editasnew'] = 'Ubah seperti baharu';
-$labels['savemessage'] = 'Simapan sebagai draf';
 $labels['sendmessage'] = 'Hantar mesej';
+$labels['savemessage'] = 'Simapan sebagai draf';
 $labels['addattachment'] = 'Lampir fail';
 $labels['charset'] = 'Set aksara';
 $labels['editortype'] = 'Jenis Editor';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 70df73b49..7b36a1fde 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
 $labels['deleted'] = 'Slettet';
+$labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Liste';
@@ -169,8 +170,8 @@ $labels['msgtext'] = 'Hele meldingen';
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
 $labels['editasnew'] = 'Rediger som ny';
-$labels['savemessage'] = 'Lagre kladd';
 $labels['sendmessage'] = 'Send e-posten';
+$labels['savemessage'] = 'Lagre kladd';
 $labels['addattachment'] = 'Vedlegg';
 $labels['charset'] = 'Tegnsett';
 $labels['editortype'] = 'Format';
@@ -198,6 +199,9 @@ $labels['nosubject'] = '(intet emne)';
 $labels['showimages'] = 'Vis bilder';
 $labels['alwaysshow'] = 'Vis alltid bilder fra $sender';
 $labels['isdraft'] = 'Dette er en kladd.';
+$labels['andnmore'] = '$nr flere ...';
+$labels['togglemoreheaders'] = 'Vis flere meldings-headere';
+$labels['togglefullheaders'] = 'Vis rå meldings-headere';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Ren tekst';
 $labels['savesentmessagein'] = 'Lagre sendt melding i';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'Importer kontakter';
 $labels['importfromfile'] = 'Importer fra fil:';
 $labels['importtarget'] = 'Legg til kontakter i adresseboka:';
 $labels['importreplace'] = 'Erstatt hele adresseboken';
-$labels['importtext'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>For øyeblikket støttes importering av kontakter i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-formatet.';
 $labels['done'] = 'Fullført';
 $labels['settingsfor'] = 'Innstillinger for';
 $labels['about'] = 'Om';
@@ -324,7 +327,8 @@ $labels['pagesize'] = 'Linjer per side';
 $labels['signature'] = 'Signatur';
 $labels['dstactive'] = 'Sommertid';
 $labels['htmleditor'] = 'Bruk HTML-editor';
-$labels['htmlonreply'] = 'kun ved svar på HTML-melding';
+$labels['htmlonreply'] = 'ved svar på HTML-melding';
+$labels['htmlonreplyandforward'] = 'ved videresending av eller svar på HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
 $labels['previewpane'] = 'Forhåndsvisning';
 $labels['skin'] = 'Utseende';
@@ -350,7 +354,6 @@ $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilder nedenfor meldingen';
 $labels['autosavedraft'] = 'Autolagring av utkast';
 $labels['everynminutes'] = 'hvert $n minutt';
-$labels['keepalive'] = 'Se etter ny e-post';
 $labels['never'] = 'Aldri';
 $labels['immediately'] = 'umiddelbart';
 $labels['messagesdisplaying'] = 'Visning av meldinger';
@@ -372,6 +375,7 @@ $labels['maintenance'] = 'Vedlikehold';
 $labels['newmessage'] = 'Ny melding';
 $labels['signatureoptions'] = 'Innstillinger for signatur';
 $labels['whenreplying'] = 'Ved svar på e-post';
+$labels['replyempty'] = 'Ikke siter den originale meldingen';
 $labels['replytopposting'] = 'start den nye meldingen over orginalmeldingen';
 $labels['replybottomposting'] = 'start den nye meldingen under orginalmeldingen';
 $labels['replyremovesignature'] = 'Fjern orginalsignaturen i svar på melding';
@@ -397,6 +401,8 @@ $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['inline'] = 'i teksten';
+$labels['asattachment'] = 'som vedlegg';
 $labels['folder'] = 'Mappe';
 $labels['foldername'] = 'Mappenavn';
 $labels['subscribed'] = 'Abonnere';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index a1f899db6..273830335 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ | Author: Martin Bore                                                   |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Forespørselen har fått et tidsavbrudd';
 $messages['errorreadonly'] = 'Kunne ikke utføre handlingen. Mappen kan kun leses.';
 $messages['errornoperm'] = 'Kan ikke utføre operasjon. Nektet tilgang.';
 $messages['invalidrequest'] = 'Ugyldig forespørsel! Ingen data ble lagret.';
+$messages['invalidhost'] = 'Ugyldig servernavn.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
 $messages['loggedout'] = 'Du er logget av webmail. Ha det bra!';
 $messages['mailboxempty'] = 'Mappen er tom!';
@@ -115,7 +116,6 @@ $messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
 $messages['contactaddedtogroup'] = 'Lagt til kontakter til denne gruppen.';
 $messages['contactremovedfromgroup'] = 'Kontaktene ble vellykket fjernet fra denne gruppen';
 $messages['importwait'] = 'Importerer, vennligst vent...';
-$messages['importerror'] = 'Feil ved importering! Den opplastede filen er ikke en gyldig vCard-fil.';
 $messages['importconfirm'] = '<b>Importerte $inserted kontakter, hoppet over $skipped oppføringer som allerede eksisterte</b>: <p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Hoppen over $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Handling ikke tillatt!';
@@ -148,7 +148,7 @@ $messages['messagemoved'] = 'Meldingen(e) er  flyttet.';
 $messages['messagecopied'] = 'Meldingen(e) er kopiert.';
 $messages['messagemarked'] = 'Meldingen(e) er markert.';
 $messages['autocompletechars'] = 'Skriv inn minst $min tegn for autofullføring.';
-$messages['autocompletemore'] = 'Flere like oppføring oppdaget. Vennligst skriv flere karakterer.';
+$messages['autocompletemore'] = 'Flere like oppføring funnet. Vennligst skriv flere tegn.';
 $messages['namecannotbeempty'] = 'Navn kan ikke være tomt.';
 $messages['nametoolong'] = 'Navnet er for langt.';
 $messages['folderupdated'] = 'Mappen er oppdatert.';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index e29c4ea30..d06a03792 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Prasanna Singh <Unknown>                                      |
+ | Author: Prasanna Singh                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -132,8 +131,8 @@ $labels['unknown'] = 'अज्ञात';
 $labels['unlimited'] = 'अनगिन्ति';
 $labels['quicksearch'] = 'स्फुर्ति खोज';
 $labels['resetsearch'] = 'पन: खोज';
-$labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
 $labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
+$labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
 $labels['addattachment'] = 'फाइल टाँस्नुहोस';
 $labels['charset'] = 'क्यारेक्टर सेट';
 $labels['editortype'] = 'सम्पादकको प्रकार';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index e9c0e7873..5691f025d 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -158,8 +157,8 @@ $labels['msgtext'] = 'Volledig bericht';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
 $labels['editasnew'] = 'Als nieuw bewerken';
-$labels['savemessage'] = 'Bewaar als concept';
 $labels['sendmessage'] = 'Verzenden';
+$labels['savemessage'] = 'Bewaar als concept';
 $labels['addattachment'] = 'Bestand toevoegen als bijlage';
 $labels['charset'] = 'Karakterset';
 $labels['editortype'] = 'Opmaak';
@@ -226,7 +225,6 @@ $labels['import'] = 'Importeer';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
-$labels['importtext'] = 'U kunt hier contactpersonen importeren vanuit een bestaand adresboek.<br />Op dit moment ondersteunen wij het <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> bestandsformaat.';
 $labels['done'] = 'Klaar';
 $labels['settingsfor'] = 'Instellingen voor';
 $labels['preferences'] = 'Voorkeuren';
@@ -274,7 +272,6 @@ $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Toon bijgevoegde afbeeldingen onder het bericht';
 $labels['autosavedraft'] = 'Automatisch als concept opslaan';
 $labels['everynminutes'] = 'elke $n minuten';
-$labels['keepalive'] = 'Controleer op nieuwe berichten';
 $labels['never'] = 'nooit';
 $labels['immediately'] = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichten weergave';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index bb93004ff..fa3e91cbe 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
+ | Author: Hendrik Maryns <hendrik@hendrikmaryns.name>                   |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['deleted'] = 'Verwijderd';
+$labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omdraaien';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Gehele bericht';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
 $labels['editasnew'] = 'Als nieuw bewerken';
-$labels['savemessage'] = 'Bewaar als concept';
+$labels['send'] = 'Verzenden';
 $labels['sendmessage'] = 'Verstuur het bericht nu';
+$labels['savemessage'] = 'Bewaar als concept';
 $labels['addattachment'] = 'Voeg een bijlage toe';
 $labels['charset'] = 'Tekenset';
 $labels['editortype'] = 'Opmaak';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(geen onderwerp)';
 $labels['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
 $labels['isdraft'] = 'Dit is een concept.';
+$labels['andnmore'] = '$nr meer...';
+$labels['togglemoreheaders'] = 'Toon meer berichtheaders';
+$labels['togglefullheaders'] = 'Originele berichtheaders aan/uit';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Gewone tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
 $labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
-$labels['importtext'] = 'U kunt hier contactpersonen importeren vanuit een bestaand adresboek.<br />Op dit moment wordt het <a href="http://nl.wikipedia.org/wiki/VCard">vCard</a>-formaat ondersteund.';
 $labels['done'] = 'Klaar';
 $labels['settingsfor'] = 'Instellingen voor';
 $labels['about'] = 'Over';
@@ -323,9 +327,11 @@ $labels['timezone'] = 'Tijdzone';
 $labels['pagesize'] = 'Aantal berichten per pagina';
 $labels['signature'] = 'Ondertekening';
 $labels['dstactive'] = 'Zomertijd';
-$labels['composeextwin'] = 'Berichten in nieuw venster';
+$labels['showinextwin'] = 'Bericht in een nieuw venster openen';
+$labels['composeextwin'] = 'In een nieuw venster bewerken';
 $labels['htmleditor'] = 'Berichten opstellen in HTML-opmaak';
 $labels['htmlonreply'] = 'alleen bij beantwoorden van HTML-berichten';
+$labels['htmlonreplyandforward'] = 'bij doorsturen of beantwoorden van een HTML-bericht';
 $labels['htmlsignature'] = 'HTML-ondertekening';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Interfacestijl';
@@ -351,7 +357,6 @@ $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Bijgevoegde afbeeldingen onder het bericht weergeven';
 $labels['autosavedraft'] = 'Concept automatisch opslaan';
 $labels['everynminutes'] = 'iedere $n minuten';
-$labels['keepalive'] = 'Op nieuwe berichten controleren';
 $labels['never'] = 'nooit';
 $labels['immediately'] = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichtenweergave';
@@ -373,6 +378,7 @@ $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
 $labels['signatureoptions'] = 'Instellingen voor ondertekening';
 $labels['whenreplying'] = 'Bij antwoorden';
+$labels['replyempty'] = 'het oorspronkelijke bericht niet citeren';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
 $labels['replybottomposting'] = 'begin bericht onder het origineel';
 $labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van bericht bij beantwoorden';
@@ -398,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Negeer woorden met cijfers';
 $labels['spellcheckignorecaps'] = 'Negeer woorden welke volledig uit hoofdletters bestaan';
 $labels['addtodict'] = 'Voeg toe aan woordenboek';
 $labels['mailtoprotohandler'] = 'Registreer protocolhandler voor mailto: links';
+$labels['forwardmode'] = 'Berichten doorsturen';
+$labels['inline'] = 'invoegen';
+$labels['asattachment'] = 'als bijlage';
 $labels['folder'] = 'Map';
 $labels['foldername'] = 'Mapnaam';
 $labels['subscribed'] = 'Geabonneerd';
@@ -421,6 +430,7 @@ $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';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 367b9197d..bb8641fac 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -9,23 +9,24 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
+ | Author: Hendrik Maryns <hendrik@hendrikmaryns.name>                   |
  +-----------------------------------------------------------------------+
 */
 
 $messages = array();
 $messages['errortitle'] = 'Er is een fout opgetreden!';
-$messages['loginfailed'] = 'Inloggen mislukt.';
+$messages['loginfailed'] = 'Aanmelden mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
 $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
 $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
-$messages['requesttimedout'] = 'Opdracht duurde te lang';
+$messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
 $messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
+$messages['invalidhost'] = 'Ongeldige servernaam.';
 $messages['nomessagesfound'] = 'Geen berichten gevonden in deze mailbox.';
 $messages['loggedout'] = 'Succesvol uitgelogd. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg.';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Selecteer een bestand om de uploaden.';
 $messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen lezen.';
 $messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep.';
 $messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep.';
+$messages['nogroupassignmentschanged'] = 'Geen groepstoewijzingen aangepast.';
 $messages['importwait'] = 'Importeren, even geduld...';
-$messages['importerror'] = 'Importeren mislukt! Het verstuurde bestand is geen geldig vCard bestand.';
 $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze verrichting is niet toegestaan!';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index d932057ae..b8cdb54a3 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -160,8 +159,8 @@ $labels['msgtext'] = 'Heile eposten';
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
 $labels['editasnew'] = 'Rediger som ny';
-$labels['savemessage'] = 'Lagra kladd';
 $labels['sendmessage'] = 'Send meldinga no';
+$labels['savemessage'] = 'Lagra kladd';
 $labels['addattachment'] = 'Legg ved ei fil';
 $labels['charset'] = 'Teiknkoding';
 $labels['editortype'] = 'Redigeringstype';
@@ -275,7 +274,6 @@ $labels['importcontacts'] = 'Importer kontaktar';
 $labels['importfromfile'] = 'Importer frå fil:';
 $labels['importtarget'] = 'Legg til kontakter i adresseboka';
 $labels['importreplace'] = 'Byt ut heile adresseboka';
-$labels['importtext'] = 'Du kan lasta opp kontaktar frå ei eksisterande adressebok.Me stør innlasting frå vCard-formatet.';
 $labels['done'] = 'Ferdig';
 $labels['settingsfor'] = 'Innstillingar for';
 $labels['preferences'] = 'Innstillingar';
@@ -322,7 +320,6 @@ $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilete under meldinga';
 $labels['autosavedraft'] = 'Lagra kladd automatisk';
 $labels['everynminutes'] = 'kvart $n minutt';
-$labels['keepalive'] = 'Sjekk etter ny epost';
 $labels['never'] = 'aldri';
 $labels['immediately'] = 'med ein gong';
 $labels['messagesdisplaying'] = 'Meldingar som viser';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 40e705ac9..2220bc6b0 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Szymon Sieciński                                             |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
 $labels['unanswered'] = 'Bez odpowiedzi';
 $labels['deleted'] = 'Usunięte';
+$labels['undeleted'] = 'Nieusunięte';
 $labels['invert'] = 'Odwróć';
 $labels['filter'] = 'Filtr';
 $labels['list'] = 'Lista';
@@ -169,8 +170,8 @@ $labels['msgtext'] = 'Cała wiadomość';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
 $labels['editasnew'] = 'Edytuj jako nową';
-$labels['savemessage'] = 'Zapisz kopię roboczą';
 $labels['sendmessage'] = 'Wyślij teraz';
+$labels['savemessage'] = 'Zapisz kopię roboczą';
 $labels['addattachment'] = 'Dołącz plik';
 $labels['charset'] = 'Kodowanie znaków';
 $labels['editortype'] = 'Typ edytora';
@@ -198,6 +199,9 @@ $labels['nosubject'] = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
 $labels['isdraft'] = 'To jest kopia robocza wiadomości.';
+$labels['andnmore'] = '$nr więcej...';
+$labels['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';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
 $labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
-$labels['importtext'] = 'Możesz dodać kontakty z istniejącej książki adresowej.<br/>Aktualnie możliwy jest import kontaktów w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Wykonane';
 $labels['settingsfor'] = 'Ustawienia dla';
 $labels['about'] = 'O programie';
@@ -325,6 +328,7 @@ $labels['signature'] = 'Podpis';
 $labels['dstactive'] = 'Czas letni';
 $labels['htmleditor'] = 'Twórz wiadomości HTML';
 $labels['htmlonreply'] = 'tylko w odpowiedzi na wiadomość HTML';
+$labels['htmlonreplyandforward'] = 'podczas przesyłania dalej lub odpowiedzi na wiadomość HTML';
 $labels['htmlsignature'] = 'Podpis w HTML';
 $labels['previewpane'] = 'Pokaż podgląd wiadomości';
 $labels['skin'] = 'Wygląd interfejsu';
@@ -350,7 +354,6 @@ $labels['always'] = 'zawsze';
 $labels['showinlineimages'] = 'Wyświetlaj załączone obrazki pod treścią wiadomości';
 $labels['autosavedraft'] = 'Automatycznie zapisuj tworzoną wiadomość';
 $labels['everynminutes'] = 'co $n minut(y)';
-$labels['keepalive'] = 'Sprawdzaj czy nadeszły nowe wiadomości';
 $labels['never'] = 'nigdy';
 $labels['immediately'] = 'natychmiast';
 $labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
@@ -372,6 +375,7 @@ $labels['maintenance'] = 'Konserwacja';
 $labels['newmessage'] = 'Nowa wiadomość';
 $labels['signatureoptions'] = 'Opcje podpisów';
 $labels['whenreplying'] = 'Podczas odpowiadania rozpocznij wiadomość';
+$labels['replyempty'] = 'nie cytuj oryginalnej wiadomości';
 $labels['replytopposting'] = 'powyżej cytowanej treści';
 $labels['replybottomposting'] = 'poniżej cytowanej treści';
 $labels['replyremovesignature'] = 'Podczas odpowiedzi usuń podpis z cytowanej treści';
@@ -397,6 +401,9 @@ $labels['spellcheckignorenums'] = 'Ignoruj słowa zawierające cyfry';
 $labels['spellcheckignorecaps'] = 'Ignoruj słowa pisane wielkimi literami';
 $labels['addtodict'] = 'Dodaj do słownika';
 $labels['mailtoprotohandler'] = 'Zainstaluj obsługę linków mailto:';
+$labels['forwardmode'] = 'Przekazywanie wiadomości';
+$labels['inline'] = 'w treści';
+$labels['asattachment'] = 'jako załącznik';
 $labels['folder'] = 'Folder';
 $labels['foldername'] = 'Nazwa folderu';
 $labels['subscribed'] = 'Zasubskrybowany';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 9593ba478..5cf7e5e36 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Upłynął limit czasu żądania';
 $messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
 $messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
 $messages['invalidrequest'] = 'Błędne żądanie! Nie zapisano danych.';
+$messages['invalidhost'] = 'Błędna nazwa serwera.';
 $messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
 $messages['loggedout'] = 'Użytkownik wylogował się poprawnie.';
 $messages['mailboxempty'] = 'Skrzynka jest pusta!';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Proszę wybrać plik do wysłania.';
 $messages['addresswriterror'] = 'Wybrana książka adresowa jest tylko-do-odczytu.';
 $messages['contactaddedtogroup'] = 'Kontakty zostały pomyślnie dodane do grupy.';
 $messages['contactremovedfromgroup'] = 'Kontakty zostały pomyślnie usunięte z grupy.';
+$messages['nogroupassignmentschanged'] = 'Nie zmieniono żadnych powiązań z grupą.';
 $messages['importwait'] = 'Importowanie, proszę czekać...';
-$messages['importerror'] = 'Błąd! Pobrany plik nie jest poprawnym plikiem vCard.';
 $messages['importconfirm'] = '<b>Pomyślnie dodano $inserted kontaktów, pominięto $skipped istniejących wpisów</b>:<p><em>$names</em></p>.';
 $messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów.</b>';
 $messages['opnotpermitted'] = 'Niedozwolona operacja!';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 5c927019b..33c2e00fa 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -124,8 +123,8 @@ $labels['unlimited'] = 'بي کچه';
 $labels['quicksearch'] = 'ژر پلټنه';
 $labels['resetsearch'] = 'د پلټنې بياسمون';
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['savemessage'] = 'دا ګارليک خوندي کړه';
 $labels['sendmessage'] = 'اوس يې واستوه';
+$labels['savemessage'] = 'دا ګارليک خوندي کړه';
 $labels['addattachment'] = 'يو فايل ونښلوه';
 $labels['charset'] = 'چيرست';
 $labels['editortype'] = 'د ټايب سمونګر';
@@ -183,7 +182,6 @@ $labels['import'] = 'رانقلول';
 $labels['importcontacts'] = 'اړيکلوري نقل کړئ';
 $labels['importfromfile'] = 'له فايل څخه رانقل کړئ';
 $labels['importreplace'] = 'ټول ادرس کتاب بدل کړئ';
-$labels['importtext'] = 'تاسې کولی شئ‌چې يو اړيکلوری له شته پتې کتاب څخه پورته کړئ<br/>موږ همدا اوس له  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>پتې رانقلوو . د فايلونو بڼې';
 $labels['done'] = 'ترسره شو';
 $labels['settingsfor'] = 'لپاره برابرونې';
 $labels['preferences'] = 'غورونې';
@@ -226,7 +224,6 @@ $labels['always'] = 'تل';
 $labels['showinlineimages'] = 'نښلول شوي انځورونه تر استوزې لاندې ښکاره کړه';
 $labels['autosavedraft'] = 'بارليک په خپل سري توګه  خوندي‌کړه';
 $labels['everynminutes'] = 'هر ه ګڼه په دقيقو کې';
-$labels['keepalive'] = 'نوي استوزي وګوره په';
 $labels['never'] = 'هېڅ';
 $labels['messagesdisplaying'] = 'استوزي ښيي';
 $labels['messagescomposition'] = 'استوزي ليکي';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index ffb8cd244..c0208eae5 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Marcada';
 $labels['unanswered'] = 'Não respondida';
 $labels['deleted'] = 'Excluída';
+$labels['undeleted'] = 'Não excluída';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Mensagem inteira';
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
 $labels['editasnew'] = 'Editar como novo';
-$labels['savemessage'] = 'Salvar como Rascunho';
+$labels['send'] = 'Enviar';
 $labels['sendmessage'] = 'Enviar agora';
+$labels['savemessage'] = 'Salvar como Rascunho';
 $labels['addattachment'] = 'Anexar um arquivo';
 $labels['charset'] = 'Codificação';
 $labels['editortype'] = 'Tipo de editor';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
 $labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
+$labels['andnmore'] = '$nr mais...';
+$labels['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';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importar contatos';
 $labels['importfromfile'] = 'Importar do arquivo:';
 $labels['importtarget'] = 'Adicionar novos contatos ao catálogo de endereços:';
 $labels['importreplace'] = 'Substituir o catálogo de endereços atual';
-$labels['importtext'] = 'Você pode enviar contatos de um catálogo de endereços existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Concluído';
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Sobre';
@@ -323,9 +327,11 @@ $labels['timezone'] = 'Fuso horário';
 $labels['pagesize'] = 'Mensagens por página';
 $labels['signature'] = 'Assinatura';
 $labels['dstactive'] = 'Horário de verão';
-$labels['composeextwin'] = 'Escrever em nova janela';
+$labels['showinextwin'] = 'Abrir mensagem em uma nova janela';
+$labels['composeextwin'] = 'Compor em uma nova janela';
 $labels['htmleditor'] = 'Criar mensagens em HTML';
 $labels['htmlonreply'] = 'em resposta à mensagem em HTML somente';
+$labels['htmlonreplyandforward'] = 'em resposta ou encaminhamento de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
 $labels['previewpane'] = 'Exibir pré-visualização';
 $labels['skin'] = 'Aparência da interface (tema)';
@@ -351,7 +357,6 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Exibir imagens anexadas abaixo da mensagem';
 $labels['autosavedraft'] = 'Salvar rascunho automaticamente';
 $labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['keepalive'] = 'Verificar se há novas mensagens';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'imediatamente';
 $labels['messagesdisplaying'] = 'Exibição de mensagens';
@@ -373,6 +378,7 @@ $labels['maintenance'] = 'Manutenção';
 $labels['newmessage'] = 'Nova mensagem';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Quando responder';
+$labels['replyempty'] = 'Não incluir a mensagem original';
 $labels['replytopposting'] = 'iniciar nova mensagem acima da original';
 $labels['replybottomposting'] = 'iniciar nova mensagem abaixo da original';
 $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao respondê-la';
@@ -398,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
 $labels['spellcheckignorecaps'] = 'Ignorar palavras com todas letras maiúsculas';
 $labels['addtodict'] = 'Adicionar ao dicionário';
 $labels['mailtoprotohandler'] = 'Associar links de e-mail (mailto:) para envio de mensagem através do webmail';
+$labels['forwardmode'] = 'Encaminhamento de mensagens';
+$labels['inline'] = 'Em linha (no corpo da mensagem)';
+$labels['asattachment'] = 'como anexo';
 $labels['folder'] = 'Pasta';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Inscrito';
@@ -421,6 +430,7 @@ $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';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 1022be797..0eb07de3a 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Tempo da requisição esgotado';
 $messages['errorreadonly'] = 'Não foi possível realizar a operação. Pasta somente leitura';
 $messages['errornoperm'] = 'Não foi possível realizar a operação. Acesso negado';
 $messages['invalidrequest'] = 'Requisição inválida! Nenhum dado foi salvo.';
+$messages['invalidhost'] = 'Endereço de servidor inválido.';
 $messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
 $messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até logo!';
 $messages['mailboxempty'] = 'A caixa de mensagens está vazia';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Selecione o arquivo a ser enviado.';
 $messages['addresswriterror'] = 'O catálogo de endereços selecionado não tem permissão de modificação';
 $messages['contactaddedtogroup'] = 'Contatos adicionados a este grupo com sucesso.';
 $messages['contactremovedfromgroup'] = 'Contatos removidos deste grupo com sucesso.';
+$messages['nogroupassignmentschanged'] = 'Nenhuma atribuição do grupo foi alterada.';
 $messages['importwait'] = 'Importando, aguarde por favor...';
-$messages['importerror'] = 'Falha na importação! O arquivo enviado não é um arquivo vCard válido.';
 $messages['importconfirm'] = '<b>Foram importados com sucesso $inserted contatos</b>';
 $messages['importconfirmskipped'] = '<b>Ignorado(s) $skipped registro(s) já existente(s)</b>';
 $messages['opnotpermitted'] = 'Operação não permitida!';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 5b2c10fdf..c17dd7ea1 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -134,6 +134,7 @@ $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
 $labels['unanswered'] = 'Não respondidas';
 $labels['deleted'] = 'Eliminadas';
+$labels['undeleted'] = 'Não eliminada';
 $labels['invert'] = 'Inverter selecção';
 $labels['filter'] = 'Filtro';
 $labels['list'] = 'Em lista';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Mensagem completa';
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
 $labels['editasnew'] = 'Editar como nova';
-$labels['savemessage'] = 'Guardar como rascunho';
+$labels['send'] = 'Enviar';
 $labels['sendmessage'] = 'Enviar';
+$labels['savemessage'] = 'Guardar como rascunho';
 $labels['addattachment'] = 'Adicionar anexo';
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Tipo de editor';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(sem assunto)';
 $labels['showimages'] = 'Mostrar imagens';
 $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
 $labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
+$labels['andnmore'] = '$nr mais...';
+$labels['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';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importação de contactos';
 $labels['importfromfile'] = 'Importar do ficheiro:';
 $labels['importtarget'] = 'Adicionar novo contacto ao livro de endereços:';
 $labels['importreplace'] = 'Substituir todo o livro de endereços.';
-$labels['importtext'] = 'Pode submeter contactos a partir de um livro de endereços.<br/>Actualmente apenas é suportada a importação de endereços no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Terminado';
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Acerca';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'Fuso horário';
 $labels['pagesize'] = 'Linhas por página';
 $labels['signature'] = 'Assinatura';
 $labels['dstactive'] = 'Horário de verão';
+$labels['showinextwin'] = 'Abrir mensagem numa nova janela';
+$labels['composeextwin'] = 'Compor numa nova janela';
 $labels['htmleditor'] = 'Escrever mensagens em HTML';
 $labels['htmlonreply'] = 'apenas em resposta a mensagens HTML';
+$labels['htmlonreplyandforward'] = 'no reencaminhamento ou resposta de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
 $labels['previewpane'] = 'Mostrar pré-visualização';
 $labels['skin'] = 'Aspecto [tema]';
@@ -350,7 +357,6 @@ $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostrar imagens anexadas abaixo da mensagem';
 $labels['autosavedraft'] = 'Guardar rascunho automaticamente';
 $labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['keepalive'] = 'Verificar existência de novas mensagens';
 $labels['never'] = 'nunca';
 $labels['immediately'] = 'imediatamente';
 $labels['messagesdisplaying'] = 'Visualização de mensagens';
@@ -372,6 +378,7 @@ $labels['maintenance'] = 'Manutenção';
 $labels['newmessage'] = 'Nova Mensagem';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Ao responder';
+$labels['replyempty'] = 'Não incluir a mensagem original';
 $labels['replytopposting'] = 'criar nova mensagem acima da original';
 $labels['replybottomposting'] = 'criar nova mensagem abaixo da original';
 $labels['replyremovesignature'] = 'Ao responder, remover a assinatura original da mensagem';
@@ -397,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
 $labels['spellcheckignorecaps'] = 'Ignorar palavras em maiúsculas';
 $labels['addtodict'] = 'Adicionar ao dicionário';
 $labels['mailtoprotohandler'] = 'Registar manipulador de protocolo para mailto: links';
+$labels['forwardmode'] = 'Reencaminhamento de mensagens';
+$labels['inline'] = 'em linha';
+$labels['asattachment'] = 'como anexo';
 $labels['folder'] = 'Pasta';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Subscrita';
@@ -420,6 +430,7 @@ $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';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index f4c18207d..980fcd01c 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'A solicitação expirou';
 $messages['errorreadonly'] = 'Não foi possível efectuar a operação. A pasta é só de leitura.';
 $messages['errornoperm'] = 'Não tem permissões para efectuar esta operação.';
 $messages['invalidrequest'] = 'Pedido inválido! Não foi guardada nenhuma informação.';
+$messages['invalidhost'] = 'Nome do servidor inválido.';
 $messages['nomessagesfound'] = 'Não existem mensagens nesta pasta.';
 $messages['loggedout'] = 'A sua sessão foi encerrada com sucesso. Até breve!';
 $messages['mailboxempty'] = 'A caixa de entrada está vazia';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Por favor, seleccione um ficheiro para enviar.'
 $messages['addresswriterror'] = 'Não é possível escrever no livro de endereços seleccionado.';
 $messages['contactaddedtogroup'] = 'Contacto adicionado com sucesso a este grupo.';
 $messages['contactremovedfromgroup'] = 'Contacto removido com sucesso deste grupo.';
+$messages['nogroupassignmentschanged'] = 'Não foi alterada nenhuma atribuição de grupo.';
 $messages['importwait'] = 'A importar, por favor aguarde...';
-$messages['importerror'] = 'A importação falhou! O ficheiro submetido não é um ficheiro vCard válido.';
 $messages['importconfirm'] = '<b>$inserted contactos importados com sucesso, $skipped contactos já existentes foram ignorados</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = 'Ignoradas $skipped entradas já existentes.';
 $messages['opnotpermitted'] = 'Operação não permitida';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index a53939c40..d41103aec 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Iorga Vladut Mihai <iorga.vladutz@cucap.ro>                   |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = 'Tot mesajul';
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
 $labels['editasnew'] = 'Editează ca nou';
-$labels['savemessage'] = 'Salvează această ciornă';
 $labels['sendmessage'] = 'Trimite mesaj';
+$labels['savemessage'] = 'Salvează această ciornă';
 $labels['addattachment'] = 'Ataşează fişier';
 $labels['charset'] = 'Set de caractere';
 $labels['editortype'] = 'Tip de editor';
@@ -298,7 +297,6 @@ $labels['importcontacts'] = 'Importă contacte';
 $labels['importfromfile'] = 'Importă din fişier:';
 $labels['importtarget'] = 'Adaugă contactele noi în agenda:';
 $labels['importreplace'] = 'Înlocuieşte întreaga agendă';
-$labels['importtext'] = 'Puteţi încărca contacte dintr-o agendă existentă. Se pot importa adresele în format vCard.';
 $labels['done'] = 'Finalizat';
 $labels['settingsfor'] = 'Setări pentru';
 $labels['about'] = 'Despre';
@@ -349,7 +347,6 @@ $labels['always'] = 'întotdeauna';
 $labels['showinlineimages'] = 'Arată imaginile ataşate sub mesaj';
 $labels['autosavedraft'] = 'Salvează ciorna automat';
 $labels['everynminutes'] = 'la fiecare $n minut(e)';
-$labels['keepalive'] = 'Verifică mesaje noi la';
 $labels['never'] = 'niciodată';
 $labels['immediately'] = 'imediat';
 $labels['messagesdisplaying'] = 'Afişarea mesajelor';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index afaba87a1..93fa05f97 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Iorga Vladut Mihai <iorga.vladutz@cucap.ro>                   |
+ | Author: Raduta Alex <raduta.alex@gmail.com>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -26,6 +25,7 @@ $messages['dberror'] = 'Eroare bază de date!';
 $messages['errorreadonly'] = 'Nu se poate efectua operaţia. Dosarul este doar-citire.';
 $messages['errornoperm'] = 'Nu se poate efectua operaţia. Acces interzis.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
+$messages['invalidhost'] = 'Hosname invalid';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
@@ -115,7 +115,6 @@ $messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
 $messages['contactaddedtogroup'] = 'Contactele au fost adăugate cu succes la acest grup';
 $messages['contactremovedfromgroup'] = 'Contactele au fost şterse cu succes din acest grup';
 $messages['importwait'] = 'Datele sunt importate, vă rugăm să aşteptaţi...';
-$messages['importerror'] = 'Importul a eşuat! Fişierul încărcat nu este un fişier vCard valid.';
 $messages['importconfirm'] = 'Contactele $inserted au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja:$names';
 $messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
 $messages['opnotpermitted'] = 'Operaţia nu este permisă!';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 33cb1e43b..b7359b0f5 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lanigiro Nainiarku <r00f@itx.com.ua>                          |
+ | Author: Nkolay Parukhin <parukhin@gmail.com>                          |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
 $labels['unanswered'] = 'Неотвеченные';
 $labels['deleted'] = 'Удаленное';
+$labels['undeleted'] = 'Не удалено';
 $labels['invert'] = 'Инвертное';
 $labels['filter'] = 'Фильтр';
 $labels['list'] = 'Список';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Всё сообщение';
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
 $labels['editasnew'] = 'Редактировать как новое';
-$labels['savemessage'] = 'Сохранить черновик';
+$labels['send'] = 'Отправлено';
 $labels['sendmessage'] = 'Отправить сейчас';
+$labels['savemessage'] = 'Сохранить черновик';
 $labels['addattachment'] = 'Добавить вложение';
 $labels['charset'] = 'Кодировка';
 $labels['editortype'] = 'Редактор';
@@ -198,6 +200,8 @@ $labels['nosubject'] = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
 $labels['isdraft'] = 'Это черновик.';
+$labels['andnmore'] = 'ещё $nr...';
+$labels['togglemoreheaders'] = 'Загрузить ещё заголовки сообщений';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Текст';
 $labels['savesentmessagein'] = 'Сохранить в';
@@ -298,7 +302,6 @@ $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
 $labels['importtarget'] = 'Добавить новые контакты в адресную книгу:';
 $labels['importreplace'] = 'Заменить всю адресную книгу';
-$labels['importtext'] = 'Вы можете загрузить контакты из существующей адресной книги. На данный момент поддерживается загрузка в формате vCard.';
 $labels['done'] = 'Завершено';
 $labels['settingsfor'] = 'Настройки для';
 $labels['about'] = 'О программе';
@@ -323,9 +326,11 @@ $labels['timezone'] = 'Часовой пояс';
 $labels['pagesize'] = 'Строк на странице';
 $labels['signature'] = 'Подпись';
 $labels['dstactive'] = 'Летнее время';
-$labels['composeextwin'] = 'Написать сообщение в новом окне';
+$labels['showinextwin'] = 'Открыть сообщение в новом окне';
+$labels['composeextwin'] = 'Создать в новом окне';
 $labels['htmleditor'] = 'Создавать сообщения в HTML';
 $labels['htmlonreply'] = 'только в ответ на сообщение в HTML';
+$labels['htmlonreplyandforward'] = 'при пересылке или ответе на HTML сообщение';
 $labels['htmlsignature'] = 'Подпись в HTML';
 $labels['previewpane'] = 'Показать панель превью';
 $labels['skin'] = 'Стиль оформления';
@@ -351,7 +356,6 @@ $labels['always'] = 'всегда';
 $labels['showinlineimages'] = 'Показывать вложенные изображения внизу сообщения';
 $labels['autosavedraft'] = 'Автосохранение черновика';
 $labels['everynminutes'] = 'каждые $n минут';
-$labels['keepalive'] = 'Проверять новые сообщения';
 $labels['never'] = 'никогда';
 $labels['immediately'] = 'немедленно';
 $labels['messagesdisplaying'] = 'Отображение сообщений';
@@ -373,6 +377,7 @@ $labels['maintenance'] = 'Обслуживание';
 $labels['newmessage'] = 'Новое сообщение';
 $labels['signatureoptions'] = 'Опции подписи';
 $labels['whenreplying'] = 'При ответе';
+$labels['replyempty'] = 'не цитировать оригинальное сообщение';
 $labels['replytopposting'] = 'начать новое сообщение перед цитируемым';
 $labels['replybottomposting'] = 'начать новое сообщение после цитируемого';
 $labels['replyremovesignature'] = 'Удалить подпись при ответе';
@@ -398,6 +403,9 @@ $labels['spellcheckignorenums'] = 'Пропускать слова с цифра
 $labels['spellcheckignorecaps'] = 'Пропускать слова из прописных букв';
 $labels['addtodict'] = 'Добавить в словарь';
 $labels['mailtoprotohandler'] = 'Зарегистрировать обработчик для ссылок mailto:';
+$labels['forwardmode'] = 'Пересылка сообщений';
+$labels['inline'] = 'в тексте';
+$labels['asattachment'] = 'как вложение';
 $labels['folder'] = 'Папка';
 $labels['foldername'] = 'Имя папки';
 $labels['subscribed'] = 'Подписан';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index eeb298279..4e3628405 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sergey Dukachev <admin@mfitness.ru>                           |
+ | Author: Nkolay Parukhin <parukhin@gmail.com>                          |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Превышено время ожидания �
 $messages['errorreadonly'] = 'Невозможно выполнить операцию. Папка доступна только для чтения';
 $messages['errornoperm'] = 'Невозможно выполнить операцию. Доступ запрещён';
 $messages['invalidrequest'] = 'Неверный запрос! Информация не сохранена.';
+$messages['invalidhost'] = 'Неверное имя сервера.';
 $messages['nomessagesfound'] = 'Сообщений не найдено';
 $messages['loggedout'] = 'Ваша сессия завершена. Всего доброго!';
 $messages['mailboxempty'] = 'Почтовый ящик пуст';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Выберите файл для загрузк
 $messages['addresswriterror'] = 'Выбранная адресная книга недоступна для записи';
 $messages['contactaddedtogroup'] = 'Контакты добавлены в группу';
 $messages['contactremovedfromgroup'] = 'Контакты удалены из группы';
+$messages['nogroupassignmentschanged'] = 'Распределение по группам не изменено.';
 $messages['importwait'] = 'Импортирование, пожалуйста, подождите...';
-$messages['importerror'] = 'Импорт завершился неудачно! Загруженный файл не является правильным файлом vCard.';
 $messages['importconfirm'] = '<b>Успешно импортировано $inserted контакт(ов), пропущено $skipped существующих</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Пропущенные $skipped существующие записи</b>';
 $messages['opnotpermitted'] = 'Действие запрещено!';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index d7e7115ac..533f64d87 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -139,8 +139,8 @@ $labels['quicksearch'] = 'ඉක්මන් සෙවුම';
 $labels['resetsearch'] = 'සෙවුම යලි පිහිටවීම';
 $labels['msgtext'] = 'සම්පූර්ණ පණිවිඩය';
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
-$labels['savemessage'] = 'කටු සටහනක් ලෙස සුරකින්න';
 $labels['sendmessage'] = 'පණිවිඩය යවන්න';
+$labels['savemessage'] = 'කටු සටහනක් ලෙස සුරකින්න';
 $labels['addattachment'] = 'ගොනුවක් අමුණන්න';
 $labels['charset'] = 'අකුරැ කට්ටලය';
 $labels['editortype'] = 'සම්පාදන ආකාරය';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 310360144..f21e376f3 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
+ | Author: Miroslav Ďurian                                              |
  +-----------------------------------------------------------------------+
 */
 
@@ -21,8 +21,8 @@ $labels['server'] = 'Server';
 $labels['login'] = 'Prihlásiť';
 $labels['logout'] = 'Odhlásiť';
 $labels['mail'] = 'E-Mail';
-$labels['settings'] = 'Osobné nastavenia';
-$labels['addressbook'] = 'Adresár';
+$labels['settings'] = 'Nastavenia';
+$labels['addressbook'] = 'Kontakty';
 $labels['inbox'] = 'Doručená pošta';
 $labels['drafts'] = 'Rozpísané';
 $labels['sent'] = 'Odoslané';
@@ -134,6 +134,7 @@ $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
 $labels['deleted'] = 'Zmazané';
+$labels['undeleted'] = 'Nevymazané';
 $labels['invert'] = 'Prevrátiť';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Zoznam';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Celá správa';
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
 $labels['editasnew'] = 'Upraviť ako novú';
-$labels['savemessage'] = 'Uložiť do rozpísaných';
+$labels['send'] = 'Odoslať';
 $labels['sendmessage'] = 'Odoslať správu';
+$labels['savemessage'] = 'Uložiť do rozpísaných';
 $labels['addattachment'] = 'Pridať prílohu';
 $labels['charset'] = 'Znaková sada';
 $labels['editortype'] = 'Typ editora';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(bez predmetu)';
 $labels['showimages'] = 'Ukázať obrázky';
 $labels['alwaysshow'] = 'Vždy zobraziť obrázky od $sender';
 $labels['isdraft'] = 'Toto je rozpísaná správa';
+$labels['andnmore'] = '$nr viac...';
+$labels['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';
@@ -211,7 +216,7 @@ $labels['mdnrequest'] = 'Odosielateľ tejto správy chce byť upozornený na to,
 $labels['receiptread'] = 'Potvrdenie o prijatí správy';
 $labels['yourmessage'] = 'Toto je potvrdenie o prijatí Vašej správy';
 $labels['receiptnote'] = 'Poznámka: Toto potvrdenie negarantuje, že správa bola príjemcom prečítaná a porozumel jej obsahu.';
-$labels['name'] = 'Celé meno';
+$labels['name'] = 'Názov';
 $labels['firstname'] = 'Meno';
 $labels['surname'] = 'Priezvisko';
 $labels['middlename'] = 'Stredné meno';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importovať kontakty';
 $labels['importfromfile'] = 'Importovať zo súboru:';
 $labels['importtarget'] = 'Pridať nové kontakty do adresára:';
 $labels['importreplace'] = 'Nahradiť celý zoznam kontaktov';
-$labels['importtext'] = 'Môžete nahrať kontakty z existujúcich adresárov. Podporujeme import adries vo formáte vCard.';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavenia pre';
 $labels['about'] = 'O programe';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'Časová zóna';
 $labels['pagesize'] = 'Riadky na stránku';
 $labels['signature'] = 'Podpis';
 $labels['dstactive'] = 'Letný čas';
+$labels['showinextwin'] = 'Otvoriť správu v novom okne';
+$labels['composeextwin'] = 'Písať v novom okne';
 $labels['htmleditor'] = 'Vytvoriť HTML správu';
 $labels['htmlonreply'] = 'len v odpovedi na HTML správy';
+$labels['htmlonreplyandforward'] = 'pri preposielaní alebo odpovedi na HTML správu';
 $labels['htmlsignature'] = 'HTML podpis';
 $labels['previewpane'] = 'Ukázať náhľad';
 $labels['skin'] = 'Vzhľad';
@@ -350,7 +357,6 @@ $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['keepalive'] = 'Kontrolovať nové správy';
 $labels['never'] = 'nikdy';
 $labels['immediately'] = 'ihneď';
 $labels['messagesdisplaying'] = 'Zobrazovanie správ';
@@ -372,6 +378,7 @@ $labels['maintenance'] = 'Údržba';
 $labels['newmessage'] = 'Nová správa';
 $labels['signatureoptions'] = 'Nastavenia podpísania';
 $labels['whenreplying'] = 'Pri odpovedaní';
+$labels['replyempty'] = 'necitovať pôvodnú správu';
 $labels['replytopposting'] = 'začať novú správu nad pôvodňou';
 $labels['replybottomposting'] = 'začať novú správu pod pôvodňou';
 $labels['replyremovesignature'] = 'Pri odpovedaní odstrániť zo správy pôvodný podpis';
@@ -397,6 +404,9 @@ $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['forwardmode'] = 'Preposielanie správ';
+$labels['inline'] = 'v tele spávy';
+$labels['asattachment'] = 'ako príloha';
 $labels['folder'] = 'Priečinok';
 $labels['foldername'] = 'Názov priečinku';
 $labels['subscribed'] = 'Prihlásený k odberu';
@@ -420,6 +430,7 @@ $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';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 417e5c951..2a2f73ec9 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
+ | Author: Miroslav Ďurian                                              |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $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['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';
@@ -114,8 +115,8 @@ $messages['selectimportfile'] = 'Zvoľte súbor, ktorý chcete načítať';
 $messages['addresswriterror'] = 'Zvolený adresár kontaktov je iba na čítanie';
 $messages['contactaddedtogroup'] = 'Kontakty boli úspešne presunuty do tejto skupiny';
 $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['importerror'] = 'Import zlyhal. Načítavaný súbor nie je platným vCard súborom.';
 $messages['importconfirm'] = '<b>Úspešne sa načítalo $inserted kontaktov, preskočilo sa $skipped existujúcich záznamov</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočených $skipped existujúcich záznamov</b>';
 $messages['opnotpermitted'] = 'Operácia nie je povolená!';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index c1ab9712d..f220c77f1 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
 */
 
@@ -169,8 +169,8 @@ $labels['msgtext'] = 'Celotno sporočilo';
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
 $labels['editasnew'] = 'Uredi kot novo';
-$labels['savemessage'] = 'Shrani kot osnutek';
 $labels['sendmessage'] = 'Pošlji sporočilo';
+$labels['savemessage'] = 'Shrani kot osnutek';
 $labels['addattachment'] = 'Pripni datoteko';
 $labels['charset'] = 'Nabor znakov';
 $labels['editortype'] = 'Vrsta urejevalnika';
@@ -298,7 +298,6 @@ $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
-$labels['importtext'] = 'Stike lahko prenesete iz obstoječega imenika<br/> Trenutno je podprto uvažanje naslovov v  formatu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>';
 $labels['done'] = 'Dokončano';
 $labels['settingsfor'] = 'Nastavitve za';
 $labels['about'] = 'Vizitka';
@@ -350,7 +349,6 @@ $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaži priponke na dnu sporočila';
 $labels['autosavedraft'] = 'Samodejno shrani osnutke';
 $labels['everynminutes'] = '$n minut';
-$labels['keepalive'] = 'Preglej nova sporočila na';
 $labels['never'] = 'nikoli';
 $labels['immediately'] = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporočil';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 707234ea6..da23fdf4e 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -94,8 +93,8 @@ $labels['unknown'] = 'i panjohur';
 $labels['unlimited'] = 'i pakufizuar';
 $labels['quicksearch'] = 'Kërkim i shpejtë';
 $labels['resetsearch'] = 'Pastro kërkimin';
-$labels['savemessage'] = 'Ruaje si draft';
 $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';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 4ee7fbef6..fb89ca200 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -161,8 +161,8 @@ $labels['msgtext'] = 'Цела порука';
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
 $labels['editasnew'] = 'Модификуј као ново';
-$labels['savemessage'] = 'Сачувај у Снимљене';
 $labels['sendmessage'] = 'Пошаљи поруку';
+$labels['savemessage'] = 'Сачувај у Снимљене';
 $labels['addattachment'] = 'Приложи датотеку';
 $labels['charset'] = 'Скуп карактера';
 $labels['editortype'] = 'Врста едитора';
@@ -288,7 +288,6 @@ $labels['importcontacts'] = 'Увези контакте';
 $labels['importfromfile'] = 'Увези из датотеке:';
 $labels['importtarget'] = 'Додај нове контакте у адресар';
 $labels['importreplace'] = 'Измени цели адресар';
-$labels['importtext'] = 'Можете да сачувате контакте већ постојећег адресара.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = 'Готово';
 $labels['settingsfor'] = 'Подешавања за';
 $labels['about'] = 'Инфо';
@@ -329,7 +328,6 @@ $labels['deletealways'] = 'Ако слање поруке у отпад не у�
 $labels['always'] = 'увек';
 $labels['showinlineimages'] = 'Покажи приложене слике испод поруке';
 $labels['autosavedraft'] = 'Аутоматски чувај у Снимљене';
-$labels['keepalive'] = 'Проверити нове поруке на';
 $labels['never'] = 'никад';
 $labels['immediately'] = 'одмах';
 $labels['messagesdisplaying'] = 'прикажи поруке';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index bb83922cc..de6884a95 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anders Wallenquist <anders.wallenquist@vertel.se>             |
+ | Author: Jonas Nasholm                                                 |
  +-----------------------------------------------------------------------+
 */
 
@@ -92,7 +92,7 @@ $labels['longsep'] = 'september';
 $labels['longoct'] = 'oktober';
 $labels['longnov'] = 'november';
 $labels['longdec'] = 'december';
-$labels['today'] = 'Idag';
+$labels['today'] = 'idag';
 $labels['refresh'] = 'Uppdatera';
 $labels['checkmail'] = 'Hämta nya meddelanden';
 $labels['compose'] = 'Nytt meddelande';
@@ -134,6 +134,7 @@ $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
 $labels['deleted'] = 'Borttagna';
+$labels['undeleted'] = 'Inte borttaget';
 $labels['invert'] = 'Invertera';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lista';
@@ -169,8 +170,9 @@ $labels['msgtext'] = 'Hela meddelandet';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
 $labels['editasnew'] = 'Redigera som nytt';
-$labels['savemessage'] = 'Spara utkast';
+$labels['send'] = 'Skicka';
 $labels['sendmessage'] = 'Skicka meddelande';
+$labels['savemessage'] = 'Spara utkast';
 $labels['addattachment'] = 'Bifoga fil';
 $labels['charset'] = 'Teckenkodning';
 $labels['editortype'] = 'Textredigerare';
@@ -198,6 +200,9 @@ $labels['nosubject'] = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
 $labels['isdraft'] = 'Detta meddelande är ett utkast.';
+$labels['andnmore'] = '$nr fler...';
+$labels['togglemoreheaders'] = 'Visa fler meddelandehuvuden';
+$labels['togglefullheaders'] = 'Växla meddelandehuvuden';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
@@ -257,7 +262,7 @@ $labels['typecar'] = 'Bil';
 $labels['typepager'] = 'Personsökare';
 $labels['typevideo'] = 'Video';
 $labels['typehomepage'] = 'Webbsida';
-$labels['typeblog'] = 'Blog';
+$labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Lägg till fält...';
 $labels['addcontact'] = 'Lägg till ny kontakt';
@@ -298,7 +303,6 @@ $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera från fil:';
 $labels['importtarget'] = 'Lägg till nya kontakter till adressbok:';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
-$labels['importtext'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>För närvarande stöds import av adresser i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-format.';
 $labels['done'] = 'Klart';
 $labels['settingsfor'] = 'Inställningar för';
 $labels['about'] = 'Om';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'Tidszon';
 $labels['pagesize'] = 'Rader per sida';
 $labels['signature'] = 'Signatur';
 $labels['dstactive'] = 'Sommartid';
+$labels['showinextwin'] = 'Öppna i nytt fönster';
+$labels['composeextwin'] = 'Skriv i nytt fönster';
 $labels['htmleditor'] = 'Skriv meddelanden i HTML-format';
 $labels['htmlonreply'] = 'Endast vid svar på meddelande i HTML-format';
+$labels['htmlonreplyandforward'] = 'vid vidarebefordring eller svar till HTML-meddelande';
 $labels['htmlsignature'] = 'HTML-signatur';
 $labels['previewpane'] = 'Visa meddelandefältet';
 $labels['skin'] = 'Stilmall för användargränssnitt';
@@ -343,14 +350,13 @@ $labels['readwhendeleted'] = 'Märk meddelande som läst vid borttagning';
 $labels['flagfordeletion'] = 'Flagga meddelande för borttagning istället för att ta bort direkt';
 $labels['skipdeleted'] = 'Visa inte borttagna meddelanden';
 $labels['deletealways'] = 'Ta bort meddelande om flyttning till Papperskorg misslyckas';
-$labels['deletejunk'] = 'Radera automatiskt meddelanden i skräpmappen';
+$labels['deletejunk'] = 'Radera meddelanden i Skräp direkt';
 $labels['showremoteimages'] = 'Visa externt länkade bilder i meddelande';
 $labels['fromknownsenders'] = 'Från kända avsändare';
 $labels['always'] = 'Alltid';
 $labels['showinlineimages'] = 'Visa bifogade bilder efter meddelande';
 $labels['autosavedraft'] = 'Spara utkast med automatiskt intervall';
 $labels['everynminutes'] = '$n min';
-$labels['keepalive'] = 'Hämta nya meddelanden med automatiskt intervall';
 $labels['never'] = 'Aldrig';
 $labels['immediately'] = 'Direkt';
 $labels['messagesdisplaying'] = 'Visning av meddelanden';
@@ -372,6 +378,7 @@ $labels['maintenance'] = 'Underhåll';
 $labels['newmessage'] = 'Nytt meddelande';
 $labels['signatureoptions'] = 'Signaturalternativ';
 $labels['whenreplying'] = 'Vid svar fortsätt skriv';
+$labels['replyempty'] = 'Inkludera inte ursprungligt meddelande';
 $labels['replytopposting'] = 'Ovanför befintligt meddelande';
 $labels['replybottomposting'] = 'Nedanför befintligt meddelande';
 $labels['replyremovesignature'] = 'Ta bort befintlig signatur från meddelandet vid svar';
@@ -397,6 +404,9 @@ $labels['spellcheckignorenums'] = 'Ignorera ord med siffror';
 $labels['spellcheckignorecaps'] = 'Ignorera ord med enbart stora bokstäver';
 $labels['addtodict'] = 'Lägg till i ordlista';
 $labels['mailtoprotohandler'] = 'Ange program för hantering av mailto-länkar';
+$labels['forwardmode'] = 'Vidarebefordra meddelande';
+$labels['inline'] = 'Infogat';
+$labels['asattachment'] = 'Bilaga';
 $labels['folder'] = 'Katalog';
 $labels['foldername'] = 'Katalognamn';
 $labels['subscribed'] = 'Prenumererad';
@@ -420,7 +430,8 @@ $labels['sortby'] = 'Sortera på';
 $labels['sortasc'] = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
 $labels['undo'] = 'Ångra';
-$labels['plugin'] = 'Plugin';
+$labels['installedplugins'] = 'Installerade tillägg';
+$labels['plugin'] = 'Tillägg';
 $labels['version'] = 'Version';
 $labels['source'] = 'Källkod';
 $labels['license'] = 'Licens';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 3ef43b527..aaf5e2b50 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Begäran tog för lång tid';
 $messages['errorreadonly'] = 'Åtgärden kunde inte utföras. Katalogen är skrivskyddad';
 $messages['errornoperm'] = 'Åtgärden kunde inte utföras. Otillräcklig befogenhet';
 $messages['invalidrequest'] = 'Ogiltig begäran! Informationen sparades inte.';
+$messages['invalidhost'] = 'Ogiltigt servernamn.';
 $messages['nomessagesfound'] = 'Inga meddelanden';
 $messages['loggedout'] = 'Du är utloggad. Välkommen åter!';
 $messages['mailboxempty'] = 'Katalogen är tom';
@@ -114,9 +115,9 @@ $messages['selectimportfile'] = 'Välj en fil att ladda upp';
 $messages['addresswriterror'] = 'Angiven adressbok är skrivskyddad';
 $messages['contactaddedtogroup'] = 'Kontakterna har lagts till i gruppen';
 $messages['contactremovedfromgroup'] = 'Kontakterna har tagits bort från gruppen';
+$messages['nogroupassignmentschanged'] = 'Ingen grupptillhörighet ändrades.';
 $messages['importwait'] = 'Importerar, var god vänta...';
-$messages['importerror'] = 'Importen misslyckades! Filen är inte i vCard-format.';
-$messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter, $skipped dubbletter har ignorerats:</b><p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter</b>';
 $messages['importconfirmskipped'] = '<b>Hoppade över $skipped befintliga poster</b>';
 $messages['opnotpermitted'] = 'Otillåten operation!';
 $messages['nofromaddress'] = 'Adress saknas i den valda identiteten';
@@ -124,12 +125,12 @@ $messages['editorwarning'] = 'Genom att växla till text-läge går formateringe
 $messages['httpreceivedencrypterror'] = 'Ett irreparabelt fel har uppstått. Kontakta administratören omgående. <b>Meddelandet kan inte skickas.</b>';
 $messages['smtpconnerror'] = 'SMTP-fel ($code): Anslutning till servern misslyckades';
 $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades';
-$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from';
-$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to';
+$messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte sätta avsändaradress till "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradress "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-fel: Felaktigt formaterad lista med mottagaradresser';
 $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Felaktig adress: $email';
-$messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max.';
+$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';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 79fb1a0ca..ecd971012 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -130,8 +129,8 @@ $labels['msgtext'] = 'முழு செய்தி';
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
 $labels['editasnew'] = 'புதியதாக திருத்து';
-$labels['savemessage'] = 'இந்த வரைவை சேமி';
 $labels['sendmessage'] = 'இப்போது அனுப்பு';
+$labels['savemessage'] = 'இந்த வரைவை சேமி';
 $labels['addattachment'] = 'ஒரு கோப்பை இணைக்கவும்';
 $labels['charset'] = 'எழுத்து குறிமுறை';
 $labels['editortype'] = 'திருத்தும் வகை';
@@ -189,7 +188,6 @@ $labels['import'] = 'இறக்குமதி';
 $labels['importcontacts'] = 'தொடர்புகளை இறக்குமதி செய்யவும்';
 $labels['importfromfile'] = 'இந்த கோப்பிலிருந்து இறக்குமதி செய்யவும்:';
 $labels['importreplace'] = 'எல்லா தொடர்புகளையும் மாற்றி அமை';
-$labels['importtext'] = 'நீங்கள் ஏற்கனவே உள்ள தொடர்புகளை ஏற்றலாம்.<br/>நாங்கள் முகவரியை <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> தரவு வடிவத்தில் ஏற்றுவதை ஆதரிக்கிறோம்';
 $labels['done'] = 'முடிந்தது';
 $labels['settingsfor'] = 'இதற்கான அமைப்புகள்';
 $labels['preferences'] = 'விருப்பங்கள்';
@@ -232,7 +230,6 @@ $labels['always'] = 'எப்போதும்';
 $labels['showinlineimages'] = 'இணைத்த படங்களை செய்திகளுக்கு கீழே காட்டவும்';
 $labels['autosavedraft'] = 'தானாக வரைவுகளை சேமி';
 $labels['everynminutes'] = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
-$labels['keepalive'] = 'புது செய்திக்கு இங்கு சரி பார்';
 $labels['never'] = 'எப்போதுமில்லை';
 $labels['messagesdisplaying'] = 'செய்திகளை காட்டுகிறது';
 $labels['messagescomposition'] = 'செய்திகளை எழுதுகிறது';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 63a1fc481..df0f49376 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -90,8 +89,8 @@ $labels['unknown'] = 'ไม่ทราบ';
 $labels['unlimited'] = 'ไม่จำกัด';
 $labels['quicksearch'] = 'ค้นหาแบบด่วน';
 $labels['resetsearch'] = 'ล้างการค้นหา';
-$labels['savemessage'] = 'บันทึกฉบับร่าง';
 $labels['sendmessage'] = 'ส่งจดหมาย';
+$labels['savemessage'] = 'บันทึกฉบับร่าง';
 $labels['addattachment'] = 'แนบไฟล์';
 $labels['charset'] = 'Charset';
 $labels['returnreceipt'] = 'ตอบกลับผู้รับ';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 61369fb75..a61098393 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
+ | Author: Gökdeniz Karadağ                                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -134,6 +134,7 @@ $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
 $labels['unanswered'] = 'Yanıtlanmamışları';
 $labels['deleted'] = 'Silinmişleri';
+$labels['undeleted'] = 'Silinmemiş';
 $labels['invert'] = 'Seçimi Tersine Çevir';
 $labels['filter'] = 'Göster';
 $labels['list'] = 'Liste';
@@ -169,8 +170,8 @@ $labels['msgtext'] = 'Tüm posta gövdesi';
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
 $labels['editasnew'] = 'Postayı yeni olarak düzenle';
-$labels['savemessage'] = 'Taslak olarak kaydet';
 $labels['sendmessage'] = 'Postayı gönder';
+$labels['savemessage'] = 'Taslak olarak kaydet';
 $labels['addattachment'] = 'Dosya ekle';
 $labels['charset'] = 'Karakter kodlaması';
 $labels['editortype'] = 'Düzenleyici';
@@ -198,6 +199,8 @@ $labels['nosubject'] = '(Konu Belirtilmemiş)';
 $labels['showimages'] = 'Resimleri göster';
 $labels['alwaysshow'] = '$sender tarafından gönderilen resimleri her zaman göster';
 $labels['isdraft'] = 'Bu posta taslaktır.';
+$labels['andnmore'] = '$nr daha...';
+$labels['togglemoreheaders'] = 'Daha fazla posta başlığı göster';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Düz metin';
 $labels['savesentmessagein'] = 'Gönderileni buraya kaydet';
@@ -298,7 +301,6 @@ $labels['importcontacts'] = 'Kişileri içe aktar';
 $labels['importfromfile'] = 'Dosyadan içe aktar:';
 $labels['importtarget'] = 'Yeni kişiler eklenecek adres defteri:';
 $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
-$labels['importtext'] = 'Mevcut bir adres defterindeki kişileri yükleyebilirsiniz.<br/><a href="http://en.wikipedia.org/wiki/VCard">vCard</a> dosyalarından adresleri içe aktarmayı destekliyoruz.';
 $labels['done'] = 'Tamam';
 $labels['settingsfor'] = 'Ayarlar';
 $labels['about'] = 'Hakkında';
@@ -350,7 +352,6 @@ $labels['always'] = 'her zaman';
 $labels['showinlineimages'] = 'Postanın ekindeki resimleri postanın altında göster';
 $labels['autosavedraft'] = 'Taslağı otomatik kaydet:';
 $labels['everynminutes'] = 'her $n dakikada bir';
-$labels['keepalive'] = 'Yeni postaları denetle:';
 $labels['never'] = 'asla';
 $labels['immediately'] = 'hemen';
 $labels['messagesdisplaying'] = 'Posta Görüntüleme';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index 23ba0480f..69a8d135e 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
+ | Author: Gökdeniz Karadağ                                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'İstek zaman aşımına uğradı';
 $messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'İşlem gerçekleştirilemedi. İzin verilmedi.';
 $messages['invalidrequest'] = 'Geçersiz İstek! Veri kaydedilmedi';
+$messages['invalidhost'] = 'Geçersiz sunucu adı.';
 $messages['nomessagesfound'] = 'Posta kutusunda ileti bulunamadı';
 $messages['loggedout'] = 'Oturumu başarılı bir şekilde kapattınız. Güle güle!';
 $messages['mailboxempty'] = 'Posta kutusu boş';
@@ -115,7 +116,6 @@ $messages['addresswriterror'] = 'Seçili adres defterine yazılamaz';
 $messages['contactaddedtogroup'] = 'Kişiler bu gruba eklendi';
 $messages['contactremovedfromgroup'] = 'Kişiler bu gruptan çıkarıldı';
 $messages['importwait'] = 'Aktarılıyor, lütfen bekleyin...';
-$messages['importerror'] = 'İçe aktarma başarısız! Yüklenen dosya geçerli bir vCard dosyası değil';
 $messages['importconfirm'] = '<b>$inserted kişi başarıyla aktarıldı</b>';
 $messages['importconfirmskipped'] = '<b>Var olan $skipped girdi atlandı</b>';
 $messages['opnotpermitted'] = 'Bu işleme izin verilmedi!';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index c373a3a2d..fd46ee5bb 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -161,8 +160,8 @@ $labels['msgtext'] = 'В усьому листі';
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
 $labels['editasnew'] = 'Редагувати як новий';
-$labels['savemessage'] = 'Зберегти чернетку';
 $labels['sendmessage'] = 'Надіслати зараз';
+$labels['savemessage'] = 'Зберегти чернетку';
 $labels['addattachment'] = 'Вкласти файл';
 $labels['charset'] = 'Кодування';
 $labels['editortype'] = 'Редактор';
@@ -285,7 +284,6 @@ $labels['importcontacts'] = 'Імпортувати контакти';
 $labels['importfromfile'] = 'Імпортувати з файлу:';
 $labels['importtarget'] = 'Додати нові контакти до адресної книги';
 $labels['importreplace'] = 'Замінити всю адресну книгу';
-$labels['importtext'] = 'Ви можете завантажити контакти з існуючої адресної книги. На даний момент підтримується імпортування контактів з формату vCard';
 $labels['done'] = 'Готово';
 $labels['settingsfor'] = 'Налаштування для';
 $labels['about'] = 'Про програму';
@@ -336,7 +334,6 @@ $labels['always'] = 'завжди';
 $labels['showinlineimages'] = 'Показувати вкладені зображення внизу листа';
 $labels['autosavedraft'] = 'Автозбереження чернетки';
 $labels['everynminutes'] = 'кожні $n хвилин';
-$labels['keepalive'] = 'Перевірка нових листів';
 $labels['never'] = 'ніколи';
 $labels['immediately'] = 'одразу';
 $labels['messagesdisplaying'] = 'Відображення листів';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 23b8bb55e..495aeeea8 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -15,13 +15,13 @@
 
 $labels = array();
 $labels['welcome'] = 'Chào bạn đã đến với $product';
-$labels['username'] = 'Tên truy nhập';
+$labels['username'] = 'Tên đăng nhập';
 $labels['password'] = 'Mật khẩu';
 $labels['server'] = 'Máy chủ';
 $labels['login'] = 'Đăng nhập';
 $labels['logout'] = 'Thoát';
 $labels['mail'] = 'Thư';
-$labels['settings'] = 'Thiết lập';
+$labels['settings'] = 'Tùy chọn';
 $labels['addressbook'] = 'Sổ địa chỉ';
 $labels['inbox'] = 'Hộp thư';
 $labels['drafts'] = 'Thư nháp';
@@ -29,31 +29,31 @@ $labels['sent'] = 'Đã gửi';
 $labels['trash'] = 'Sọt rác';
 $labels['junk'] = 'Thư rác';
 $labels['subject'] = 'Tiêu đề';
-$labels['from'] = 'Từ';
-$labels['to'] = 'Tới';
-$labels['cc'] = 'Người đồng nhận (người nhận nhìn thấy địa chỉ email của ngừoi khác cùng được nhận thư)';
+$labels['from'] = 'Người gửi';
+$labels['to'] = 'Người nhận';
+$labels['cc'] = 'Đồng kính gửi';
 $labels['bcc'] = 'Người đồng nhận (ngừoi nhận không thấy email của người khác cùng được nhận thư)';
 $labels['replyto'] = 'Trả lời cho';
 $labels['followupto'] = 'Đánh dấu thư cần theo dõi';
 $labels['date'] = 'Ngày';
 $labels['size'] = 'Dung lượng';
-$labels['priority'] = 'Mức độ ưu tiên';
+$labels['priority'] = 'Độ ưu tiên';
 $labels['organization'] = 'Tổ chức';
-$labels['readstatus'] = 'Đọc trạng thái';
-$labels['listoptions'] = 'Lựa chọn danh sách';
+$labels['readstatus'] = 'Trạng thái của thư';
+$labels['listoptions'] = 'Danh sách lựa chọn';
 $labels['mailboxlist'] = 'Giữ liệu';
 $labels['folders'] = 'Giữ liệu';
-$labels['messagesfromto'] = 'Thư $from - $to / $count';
-$labels['threadsfromto'] = 'Dòng thư từ $from đến $to của tổng $count';
-$labels['messagenrof'] = 'Thư $nr / $count';
+$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'] = 'Chuyển';
-$labels['moveto'] = 'Chuyển tới';
+$labels['move'] = 'Di Chuyển';
+$labels['moveto'] = 'Di chuyển tới...';
 $labels['download'] = 'Tải về';
 $labels['filename'] = 'Tên tập tin';
-$labels['filesize'] = 'Dung lượng tập tin';
-$labels['addtoaddressbook'] = 'Thêm vào sổ địa chỉ';
+$labels['filesize'] = 'Kích cỡ tập tin';
+$labels['addtoaddressbook'] = 'Thêm vào danh bạ';
 $labels['sun'] = 'Chủ Nhật';
 $labels['mon'] = 'Thứ Hai';
 $labels['tue'] = 'Thứ Ba';
@@ -93,18 +93,18 @@ $labels['longoct'] = 'Tháng Mười';
 $labels['longnov'] = 'Tháng Mười Một';
 $labels['longdec'] = 'Tháng Mười Hai';
 $labels['today'] = 'Hôm nay';
-$labels['refresh'] = 'Làm mới lại';
+$labels['refresh'] = 'Nạp lại';
 $labels['checkmail'] = 'Kiểm tra thư mới';
 $labels['compose'] = 'Soạn thư';
 $labels['writenewmessage'] = 'Viết thư mới';
 $labels['reply'] = 'Trả lời thư';
 $labels['replytomessage'] = 'Trả lời thư người gửi';
-$labels['replytoallmessage'] = 'Trả lời theo danh sách hoặc tới người gửi và tất cả người nhận';
+$labels['replytoallmessage'] = 'Trả lời lại danh sách hoặc tới tất cả người gửi và người nhận của thư này';
 $labels['replyall'] = 'Trả lời tất cả';
 $labels['replylist'] = 'Danh sách trả lời';
 $labels['forward'] = 'Chuyển tiếp';
 $labels['forwardinline'] = 'Chuyển tiếp thư';
-$labels['forwardattachment'] = 'Chuyển tiếp như đính kèm';
+$labels['forwardattachment'] = 'Chuyển tiếp theo phương cách đính kèm';
 $labels['forwardmessage'] = 'Chuyển tiếp thư';
 $labels['deletemessage'] = 'Xóa thư';
 $labels['movemessagetotrash'] = 'Chuyển thư vào thùng rác';
@@ -125,25 +125,26 @@ $labels['moreactions'] = 'Thêm hành động...';
 $labels['more'] = 'Thêm';
 $labels['back'] = 'Quay lại';
 $labels['options'] = 'Tuỳ chọn';
-$labels['select'] = 'Chọn';
+$labels['select'] = 'Lựa chọn';
 $labels['all'] = 'Tất cả';
 $labels['none'] = 'Không có';
 $labels['nonesort'] = 'Không có';
-$labels['currpage'] = 'Trang hiện thời';
+$labels['currpage'] = 'Trang hiện tại';
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
-$labels['unanswered'] = 'Chưa được trả lời';
-$labels['deleted'] = 'Đã được xóa';
+$labels['unanswered'] = 'Chưa trả lời';
+$labels['deleted'] = 'Đã xóa';
+$labels['undeleted'] = 'Chưa xóa được';
 $labels['invert'] = 'Đảo ngược';
-$labels['filter'] = 'Lọc';
+$labels['filter'] = 'Soạn lọc';
 $labels['list'] = 'Danh sách';
-$labels['threads'] = 'Dòng thư';
+$labels['threads'] = 'Chủ đề thư';
 $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'] = 'Đã được phân loại';
-$labels['autoexpand_threads'] = 'Mở rộng các dòng thư';
-$labels['do_expand'] = 'Tất cả các dòng thư';
+$labels['threaded'] = 'Đã nhóm theo chủ đề thư';
+$labels['autoexpand_threads'] = 'Mở rộng các chủ đề thư';
+$labels['do_expand'] = 'Tất cả các chủ đề thư';
 $labels['expand_only_unread'] = 'Chỉ với những thư chưa đọc';
 $labels['fromto'] = 'Từ/Đến';
 $labels['flag'] = 'Đánh dấu';
@@ -153,29 +154,30 @@ $labels['arrival'] = 'Ngày đến';
 $labels['asc'] = 'Tăng dần';
 $labels['desc'] = 'Giảm dần';
 $labels['listcolumns'] = 'Các cột danh sách';
-$labels['listsorting'] = 'Phân loại cột';
-$labels['listorder'] = 'Sắp xếp thứ tự';
-$labels['listmode'] = 'Hình thức xem danh sách';
-$labels['folderactions'] = 'Ứng xử với giữ liệu...';
+$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'] = 'Rỗng';
+$labels['empty'] = 'Trống';
 $labels['quota'] = 'Lượng đĩa sử dụng';
 $labels['unknown'] = 'Không rõ';
-$labels['unlimited'] = 'Không hạn chế';
+$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['openinextwin'] = 'Mở bằng cửa sổ mới';
-$labels['emlsave'] = 'Tải về';
-$labels['editasnew'] = 'Sửa thành mới';
-$labels['savemessage'] = 'Lưu dạng nháp';
+$labels['openinextwin'] = 'Mở trong khung cửa mới';
+$labels['emlsave'] = 'Tải về theo định dạng .eml';
+$labels['editasnew'] = 'Sửa như một email mới';
+$labels['send'] = 'Gửi';
 $labels['sendmessage'] = 'Gửi thư';
-$labels['addattachment'] = 'Đính kèm tập tin';
-$labels['charset'] = 'Bảng mã';
-$labels['editortype'] = 'Loại soạn thảo';
+$labels['savemessage'] = 'Lưu dạng nháp';
+$labels['addattachment'] = 'Kèm theo tập tin';
+$labels['charset'] = 'Bộ ký tự';
+$labels['editortype'] = 'Loại trình soạn thảo';
 $labels['returnreceipt'] = 'Báo nhận';
-$labels['dsn'] = 'Thông báo tình trạng phân phát thư';
+$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';
@@ -192,13 +194,16 @@ $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'] = 'Khẩn';
-$labels['highest'] = 'Thượng khẩn';
+$labels['high'] = 'Cao';
+$labels['highest'] = 'Cao nhất';
 $labels['nosubject'] = '(Không có chủ đề)';
 $labels['showimages'] = 'Hiển thị ảnh';
-$labels['alwaysshow'] = 'Luôn hiển thị hình ảnh từ người gửi';
+$labels['alwaysshow'] = 'Luôn luôn hiển thị ảnh từ $sender';
 $labels['isdraft'] = 'Đây là thư nháp';
-$labels['htmltoggle'] = 'Khối HTML';
+$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';
@@ -207,9 +212,9 @@ $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';
-$labels['mdnrequest'] = 'Người gửi thư này yêu cầu được thông báo khi bạn đã đọc thư này. Bạn có muốn thông báo cho người gửi không?';
-$labels['receiptread'] = 'Hồi đáp biên nhận (đã đọc)';
-$labels['yourmessage'] = 'Đây là hồi đáp biên nhận cho thư của bạn';
+$labels['mdnrequest'] = 'Người gửi thư này muốn nhận được thông báo khi bạn đọc thư. Bạn có muốn cho người gửi biết thông báo này không?';
+$labels['receiptread'] = 'Biên nhận (đã đọc)';
+$labels['yourmessage'] = 'Đây là sự trả lại xác nhận cho thư của bạn';
 $labels['receiptnote'] = 'Lưu ý: Biên nhận này chỉ báo rằng thư đã được hiển thị trên máy tính của người nhận. Không bảo đảm rằng người nhận đó đã có đọc hoặc hiểu nội dung thư.';
 $labels['name'] = 'Tên hiển thị';
 $labels['firstname'] = 'Tên Gọi';
@@ -233,7 +238,7 @@ $labels['country'] = 'Quốc gia';
 $labels['birthday'] = 'Ngày sinh';
 $labels['anniversary'] = 'Kỷ niệm';
 $labels['website'] = 'Trang Web';
-$labels['instantmessenger'] = 'Tin nhắn';
+$labels['instantmessenger'] = 'Tin nhắn nhanh';
 $labels['notes'] = 'Các ghi chú';
 $labels['male'] = 'Nam';
 $labels['female'] = 'Nữ';
@@ -243,7 +248,7 @@ $labels['typeassistant'] = 'Trợ lý';
 $labels['spouse'] = 'Vợ/Chồng';
 $labels['allfields'] = 'Tất cả các lĩnh vực';
 $labels['search'] = 'Tìm kiếm';
-$labels['advsearch'] = 'Tìm kiếm nâng cao';
+$labels['advsearch'] = 'Tìm kiếm chi tiết';
 $labels['advanced'] = 'Nâng cao';
 $labels['other'] = 'Loại khác';
 $labels['typeother'] = 'Loại khác';
@@ -255,9 +260,9 @@ $labels['typehomefax'] = 'Điện thư ở Nhà';
 $labels['typeworkfax'] = 'Điện thư cơ quan';
 $labels['typecar'] = 'Xe';
 $labels['typepager'] = 'Máy nhắn tin';
-$labels['typevideo'] = 'Video';
+$labels['typevideo'] = 'Phim';
 $labels['typehomepage'] = 'Trang nhà';
-$labels['typeblog'] = 'Nhật ký Mạng';
+$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';
@@ -273,20 +278,20 @@ $labels['rename'] = 'Đổi tên';
 $labels['addphoto'] = 'Thêm';
 $labels['replacephoto'] = 'Thay thế';
 $labels['uploadphoto'] = 'Tải ảnh lên';
-$labels['newcontact'] = 'Tạo thẻ danh bạ mới';
+$labels['newcontact'] = 'Tạo danh bạ mới';
 $labels['deletecontact'] = 'Xoá các liên lạc đã chọn';
 $labels['composeto'] = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Liên hệ từ $from - $to / $count';
-$labels['print'] = 'In thư';
+$labels['print'] = 'In ra';
 $labels['export'] = 'Trích xuất';
-$labels['exportvcards'] = 'Xuất các liên lạc theo định dạng vCard';
+$labels['exportvcards'] = 'Tải dữ liệu máy theo định dạng vCard';
 $labels['newcontactgroup'] = 'Tạo nhóm liên lạc mới';
 $labels['grouprename'] = 'Đổi tên nhóm';
 $labels['groupdelete'] = 'Xóa nhóm';
 $labels['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ị đầu tiên';
-$labels['nextpage'] = 'Hiển thị trang tiếp theo';
+$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';
@@ -295,10 +300,9 @@ $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:';
+$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['importtext'] = 'Bạn có thể tải liên lạc lên từ sổ địa chỉ sẵn có.<br/> Chúng tôi hỗ trợ nhập địa chỉ từ <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = 'Hoàn tất';
 $labels['settingsfor'] = 'Thiết lập cho';
 $labels['about'] = 'Lời ngõ';
@@ -312,8 +316,8 @@ $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ư kiểu HTML';
-$labels['dateformat'] = 'Định dạng ngày';
+$labels['htmlmessage'] = 'Thư theo định dạng HTML';
+$labels['dateformat'] = 'Định dạng ngày tháng';
 $labels['timeformat'] = 'Định dạng thời gian';
 $labels['prettydate'] = 'Ngày tháng đầy đủ';
 $labels['setdefault'] = 'Thiết lập mặc định';
@@ -323,8 +327,11 @@ $labels['timezone'] = 'Múi giờ';
 $labels['pagesize'] = 'Số dòng trên trang';
 $labels['signature'] = 'Chữ ký';
 $labels['dstactive'] = 'Giờ mùa hè';
+$labels['showinextwin'] = 'Mở thư trong khung mới';
+$labels['composeextwin'] = 'Soạn thư trong khung mới';
 $labels['htmleditor'] = 'Soạn thư dạng HTML';
-$labels['htmlonreply'] = 'Chỉ trả lời thư bằng 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['previewpane'] = 'Hiển thị ô Xem thử';
 $labels['skin'] = 'Bề mặt giao diện';
@@ -343,18 +350,17 @@ $labels['readwhendeleted'] = 'Đánh dấu thư là đã đọc khi xóa';
 $labels['flagfordeletion'] = 'Đánh dấu thư để xóa thay vì xóa liền';
 $labels['skipdeleted'] = 'Không hiển thị thư đã xóa';
 $labels['deletealways'] = 'Nếu việc chuyển thư vào thùng rác bị lỗi thì xóa luôn.';
-$labels['deletejunk'] = 'Xóa thư trực tiếp trong thùng rác';
+$labels['deletejunk'] = 'Trực tiếp xóa các thư rác trong thùng Junk';
 $labels['showremoteimages'] = 'Hiển thị ảnh nội tuyến từ xa';
 $labels['fromknownsenders'] = 'Từ người gửi đã biết';
 $labels['always'] = 'luôn luôn';
 $labels['showinlineimages'] = 'Hiển thị ảnh đính kèm phía dưới thư';
 $labels['autosavedraft'] = 'Tự động lưu bản nháp';
-$labels['everynminutes'] = 'cứ mỗi $n phút';
-$labels['keepalive'] = 'Kiểm tra thư đến';
+$labels['everynminutes'] = '$n phút một lần';
 $labels['never'] = 'không bao giờ';
 $labels['immediately'] = 'ngay lập tức';
 $labels['messagesdisplaying'] = 'Đang hiển thị thư';
-$labels['messagescomposition'] = 'Đang soạn thư';
+$labels['messagescomposition'] = 'Đang viết thư';
 $labels['mimeparamfolding'] = 'Tên đính kèm';
 $labels['2231folding'] = 'RFC 2231 đầy đủ (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -362,42 +368,46 @@ $labels['2047folding'] = 'RFC 2047 đầy đủ (khác)';
 $labels['force7bit'] = 'Sử dụng MIME mã hóa cho ký tự 8-bit';
 $labels['advancedoptions'] = 'Tùy chọn tính năng cao hơn';
 $labels['focusonnewmessage'] = 'Tập trung khung cửa trình duyệt vào thư mới';
-$labels['checkallfolders'] = 'Kiểm tra thư mới trong tất cả giữ liệu';
-$labels['displaynext'] = 'Sau khi xóa thư/chuyển hiển thị thư kế tiếp';
+$labels['checkallfolders'] = 'Kiểm tra thư mới trong tất cả thư mục';
+$labels['displaynext'] = 'Sau khi "xóa/di chuyển" thư thì hiển thị thư kế tiếp';
 $labels['defaultfont'] = 'Phông chữ mặc định của thư có mã HTML';
 $labels['mainoptions'] = 'Tùy chọn chính';
 $labels['browseroptions'] = 'Tùy chọn Trình duyệt';
-$labels['section'] = 'Mục';
+$labels['section'] = 'Phần';
 $labels['maintenance'] = 'Bảo trì';
 $labels['newmessage'] = 'Thư mới';
-$labels['signatureoptions'] = 'Chữ ký tuỳ chọn';
+$labels['signatureoptions'] = 'Tuỳ chọn chữ ký';
 $labels['whenreplying'] = 'Khi trả lời';
-$labels['replytopposting'] = 'bắt đầu viết thư mới trên nội dung của thư cũ';
-$labels['replybottomposting'] = 'bắt đầu thư mới dưới nội dung thư cũ';
+$labels['replyempty'] = 'Không mở/đóng ngoạc nội dung bản thư gốc';
+$labels['replytopposting'] = 'Viết nội dung thư mới bên trên nội dung thư cũ';
+$labels['replybottomposting'] = 'Viết nội dung thư mới bên dưới nội dung thư cũ';
 $labels['replyremovesignature'] = 'Khi trả lời bỏ chữ ký cũ khỏi nội dung thư';
 $labels['autoaddsignature'] = 'Tự động thêm chữ ký';
 $labels['newmessageonly'] = 'chỉ thư mới';
 $labels['replyandforwardonly'] = 'chỉ trả lời và chuyển tiếp thư';
 $labels['replysignaturepos'] = 'Khi trả lời hoặc chuyển tiếp thư thêm vào chữ ký';
-$labels['belowquote'] = 'dưới phần trích dẫn';
-$labels['abovequote'] = 'trên phẩn trích dẫn';
+$labels['belowquote'] = 'Dưới phần nội dung cũ';
+$labels['abovequote'] = 'trên phần nội dung cũ';
 $labels['insertsignature'] = 'Chèn chữ ký';
 $labels['previewpanemarkread'] = 'Đánh dẫu thư xem thử là đã đọc';
 $labels['afternseconds'] = 'sau $n giây';
-$labels['reqmdn'] = 'Luôn yêu cầu hồi đáp biên nhận';
-$labels['reqdsn'] = 'Luôn yêu cẩu thông báo trạng thái thư đã gửi';
-$labels['replysamefolder'] = 'Nhập các thư trả lời nhận được vào cùng giữ liệu của thư mà bạn đã trả lời';
-$labels['defaultaddressbook'] = 'Tạo liên hệ mới trong sổ địa chỉ đã chọn';
+$labels['reqmdn'] = 'Luôn luôn yêu cầu biên nhận khi gửi thư';
+$labels['reqdsn'] = 'Luôn yêu cầu xác nhận trạng thái thư cho người gửi';
+$labels['replysamefolder'] = 'Đưa các thư trả lời nhận được vào cùng giữ liệu của thư mà bạn đã trả lời';
+$labels['defaultaddressbook'] = 'Thêm thông tin liên lạc mới vào sổ địa chỉ đã chọn';
 $labels['autocompletesingle'] = 'Bỏ qua địa chỉ email thay thế trong năng tự động gõ';
-$labels['listnamedisplay'] = 'Hiện thị danh sách liên lạc như';
+$labels['listnamedisplay'] = 'Hiện thị danh sách liên lạc như là';
 $labels['spellcheckbeforesend'] = 'Kiểm tra chính tả trước khi gửi thư';
 $labels['spellcheckoptions'] = 'Tùy chọn kiểm tra chính tả';
 $labels['spellcheckignoresyms'] = 'Bỏ qua từ kèm biểu tượng';
 $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'] = 'Đăng ký giao thức cho mailto: liên kết';
-$labels['folder'] = 'Giữ liệu';
+$labels['mailtoprotohandler'] = 'Xác định cách xử lý giao thức mailto: liên kết';
+$labels['forwardmode'] = 'Chuyển tiếp thư';
+$labels['inline'] = 'nội tuyến';
+$labels['asattachment'] = 'dạng gửi kèm';
+$labels['folder'] = 'Thư mục';
 $labels['foldername'] = 'Tên giữ liệu';
 $labels['subscribed'] = 'Đã đăng ký';
 $labels['messagecount'] = 'Các tin nhắn';
@@ -424,7 +434,7 @@ $labels['plugin'] = 'Phần bổ sung';
 $labels['version'] = 'Phiên bản';
 $labels['source'] = 'Nguồn';
 $labels['license'] = 'Bản quyền';
-$labels['support'] = 'Nhận hỗ trợ';
+$labels['support'] = 'Yêu cầu hỗ trợ';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -443,8 +453,8 @@ $labels['turkish'] = 'Tiếng Thổ Nhĩ Kỳ';
 $labels['nordic'] = 'Tiếng Bắc Âu';
 $labels['thai'] = 'Tiếng Thái Lan';
 $labels['celtic'] = 'Tiếng Xen-tơ';
-$labels['vietnamese'] = 'Tiếng Việt Nam';
-$labels['japanese'] = 'Tiếng Nhật Bản';
-$labels['korean'] = 'Tiếng Hàn Quốc';
-$labels['chinese'] = 'Tiếng Trung Hoa';
+$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 7f6facd09..73435b6e3 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -26,6 +26,7 @@ $messages['requesttimedout'] = 'Yêu cầu hết  hạn';
 $messages['errorreadonly'] = 'Không thể thực hiện thao tác. Giữ liệu chỉ cho phép đọc.';
 $messages['errornoperm'] = 'Không thể thực hiện thao tác. Sự cho phép bị từ chối.';
 $messages['invalidrequest'] = 'Yêu cầu không hợp lệ! Không có dữ liệu nào được lưu.';
+$messages['invalidhost'] = 'Sai thông tin máy chủ';
 $messages['nomessagesfound'] = 'Không thấy có thư nào trong hộp thư này.';
 $messages['loggedout'] = 'Phiên làm việc đã kết thúc thành công. Hẹn gặp lại!';
 $messages['mailboxempty'] = 'Hộp thư rỗng';
@@ -105,7 +106,7 @@ $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...';
 $messages['removingmember'] = 'Đang xóa liên lạc từ nhóm...';
-$messages['receiptsent'] = 'Gửi thành công ghi nhận đã đọc';
+$messages['receiptsent'] = 'Biên nhận đọc đã được gửi thành công.';
 $messages['errorsendingreceipt'] = 'Không thể gửi ghi nhận';
 $messages['deleteidentityconfirm'] = 'Bạn có thực sự muốn xóa nhận diện này?';
 $messages['nodeletelastidentity'] = 'Bạn không thể xóa nhận diện này, đó là cái cuối cùng của bạn.';
@@ -114,13 +115,13 @@ $messages['selectimportfile'] = 'Xin chọn hồ sơ để tải lên.';
 $messages['addresswriterror'] = 'Sổ địa chỉ đã chọn không thể viết lại được';
 $messages['contactaddedtogroup'] = 'Thêm liên lạc vào nhóm này thành công';
 $messages['contactremovedfromgroup'] = 'Xóa liên lạc khỏi nhóm này thành công';
+$messages['nogroupassignmentschanged'] = 'Không quy nhóm nào đả được thay đổi';
 $messages['importwait'] = 'Đang nhập, xin chờ...';
-$messages['importerror'] = 'Nhập thất bại! Tập tin tải lên không phải là tập tin vCard hợp lệ.';
 $messages['importconfirm'] = 'Đã nhập $inserted liên hệ đã chèn vào thành công.';
 $messages['importconfirmskipped'] = 'Đã bỏ qua được $skipped mục tồn tại.';
 $messages['opnotpermitted'] = 'Thao tác không được cho phép!';
 $messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
-$messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định diện text đã có bị mất. Bạn có muốn tiếp tục không?';
+$messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
 $messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với ngừoi quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
 $messages['smtpconnerror'] = 'Lỗi SMTP ($code): Kết nỗi tới máy chủ bị lỗi.';
 $messages['smtpautherror'] = 'Lỗi SMTP ($code): Xác thực thất bại.';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 62bd376c0..1de39e491 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -168,8 +168,8 @@ $labels['msgtext'] = '整个邮件';
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载（.eml）';
 $labels['editasnew'] = '编辑为新邮件';
-$labels['savemessage'] = '保存为草稿';
 $labels['sendmessage'] = '立即发送';
+$labels['savemessage'] = '保存为草稿';
 $labels['addattachment'] = '添加附件';
 $labels['charset'] = '字符集';
 $labels['editortype'] = '编辑器类型';
@@ -297,7 +297,6 @@ $labels['importcontacts'] = '导入联系人';
 $labels['importfromfile'] = '从文件导入';
 $labels['importtarget'] = '增加新联系人到通讯录:';
 $labels['importreplace'] = '替换整个地址簿';
-$labels['importtext'] = '你可以从已有的地址簿导入联系人。目前支持从 vCard 数据格式导入地址簿。';
 $labels['done'] = '完成';
 $labels['settingsfor'] = '设置';
 $labels['about'] = '关于';
@@ -349,7 +348,6 @@ $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft'] = '自动保存到草稿箱';
 $labels['everynminutes'] = '每隔 $n 分钟';
-$labels['keepalive'] = '检查新邮件';
 $labels['never'] = '从不';
 $labels['immediately'] = '立即';
 $labels['messagesdisplaying'] = '显示参数';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index ea029acd4..cb4ef77ed 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -170,8 +169,8 @@ $labels['msgtext'] = '整封郵件';
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
 $labels['editasnew'] = '以新郵件編輯';
-$labels['savemessage'] = '儲存成草稿';
 $labels['sendmessage'] = '立即寄出';
+$labels['savemessage'] = '儲存成草稿';
 $labels['addattachment'] = '增加附件檔案';
 $labels['charset'] = '郵件編碼';
 $labels['editortype'] = '編輯器類型';
@@ -299,7 +298,6 @@ $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
 $labels['importtarget'] = '新增連絡人至通訊錄:';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
-$labels['importtext'] = '你可以由已存在的通訊錄上傳資料，<br/>目前系統僅支援匯入 <a href="http://zh.wikipedia.org/wiki/VCard" target="_blank">vCard</a> 格式的資料。';
 $labels['done'] = '完成';
 $labels['settingsfor'] = '設定';
 $labels['about'] = '關於';
@@ -351,7 +349,6 @@ $labels['always'] = '總是接受';
 $labels['showinlineimages'] = '將附加檔案的圖片顯示於郵件最後';
 $labels['autosavedraft'] = '自動儲存草稿';
 $labels['everynminutes'] = '每 $n 分鐘';
-$labels['keepalive'] = '檢查新郵件的間隔時間';
 $labels['never'] = '絕對不要';
 $labels['immediately'] = '馬上';
 $labels['messagesdisplaying'] = '郵件顯示設定';