Updated Arabic, Finnish, Galician, Hungarian, Japanese, Norwegian, Romanian, Slovenian and Swedisch translation + changed chinese labels in drop-down

20 files changed, 582 insertions, 130 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index d2deeb76f..c1e358d81 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -6,7 +6,7 @@
 | language/ar_SA/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -45,14 +45,14 @@ $labels['organization'] = 'المنظمة';
 $labels['reply-to'] = 'الرد إلى';
 $labels['mailboxlist'] = 'المجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من $count';
+$labels['threadsfromto'] = 'المراسلات $from إلى $to من $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
+$labels['copy'] = 'نسخ';
+$labels['move'] = 'نقل';
 $labels['moveto'] = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
-$labels['preferhtml'] = 'تفضيل صيغة HTML';
-$labels['htmlmessage'] = 'رسالة بنسق HTML';
-$labels['prettydate'] = 'تواريخ منمقة';
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
 $labels['sun'] = 'أح';
 $labels['mon'] = 'إث';
@@ -116,10 +116,38 @@ $labels['markread'] = 'كمقروءة';
 $labels['markunread'] = 'كغير مقروءة';
 $labels['markflagged'] = 'كموْسومة';
 $labels['markunflagged'] = 'كغير موْسومة';
+$labels['messageactions'] = 'إجراءات إضافية...';
 $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
 $labels['none'] = 'لا شيء';
+$labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
+$labels['flagged'] = 'موسوم';
+$labels['unanswered'] = 'بلا رد';
+$labels['deleted'] = 'محذوف';
+$labels['invert'] = 'عكس';
+$labels['filter'] = 'تصفية';
+$labels['list'] = 'قائمة';
+$labels['threads'] = 'تتابعات';
+$labels['expand-all'] = 'إظهار الكل';
+$labels['expand-unread'] = 'إظهار الغير مقروءة';
+$labels['collapse-all'] = 'ضمّ الكل';
+$labels['threaded'] = 'متتابع';
+$labels['autoexpand_threads'] = 'إظهار تتابعات الرسائل';
+$labels['do_expand'] = 'جميع التتابعات';
+$labels['expand_only_unread'] = 'فقط مع الرسائل الغير مقروءة';
+$labels['fromto'] = 'المرسل/المستلم';
+$labels['flag'] = 'وسم';
+$labels['attachment'] = 'مرفق';
+$labels['nonesort'] = 'لاشيء';
+$labels['sentdate'] = 'تاريخ إرسالها';
+$labels['arrival'] = 'تاريخ وصولها';
+$labels['asc'] = 'تصاعدي';
+$labels['desc'] = 'تنازلي';
+$labels['listcolumns'] = 'أعمدة السرد';
+$labels['listsorting'] = 'أعمدة الترتيب';
+$labels['listorder'] = 'طريقة الترتيب';
+$labels['listmode'] = 'وضع طريقة السرد';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
 $labels['purge'] = 'إزالة';
@@ -128,8 +156,12 @@ $labels['unknown'] = 'مجهول';
 $labels['unlimited'] = 'غير محدود';
 $labels['quicksearch'] = 'البحث السريع';
 $labels['resetsearch'] = 'استعادة البحث للافتراضي';
+$labels['searchmod'] = 'أماكن البحث';
+$labels['msgtext'] = 'كامل الرسالة';
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
+$labels['emlsave'] = 'تنزيل (.eml)';
 $labels['compose'] = 'إنشاء رسالة';
+$labels['editasnew'] = 'تعديل كجديد';
 $labels['savemessage'] = 'حفظ هذه المسودة';
 $labels['sendmessage'] = 'إرسال الرسالة الآن';
 $labels['addattachment'] = 'إرفاق ملف';
@@ -179,10 +211,13 @@ $labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
 $labels['print'] = 'طباعة';
 $labels['export'] = 'تصدير';
 $labels['exportvcards'] = 'صدّر المراسلين بنسق vCard';
+$labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
+$labels['groupactions'] = 'إجراءات مجموعات المراسلين...';
 $labels['previouspage'] = 'عرض المجموعة السابقة';
 $labels['firstpage'] = 'عرض المجموعة الأولى';
 $labels['nextpage'] = 'عرض المجموعة التالية';
 $labels['lastpage'] = 'عرض المجموعة الأخيرة';
+$labels['group'] = 'مجموعة';
 $labels['groups'] = 'المجموعات';
 $labels['personaladrbook'] = 'العناوين الشخصية';
 $labels['import'] = 'استورد';
@@ -200,6 +235,10 @@ $labels['manageidentities'] = 'إدارة هويات هذا الحساب';
 $labels['newidentity'] = 'هوية جديدة';
 $labels['newitem'] = 'عنصر جديد';
 $labels['edititem'] = 'تحرير عنصر';
+$labels['preferhtml'] = 'تفضيل صيغة HTML';
+$labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
+$labels['htmlmessage'] = 'رسالة بنسق HTML';
+$labels['prettydate'] = 'تواريخ منمقة';
 $labels['setdefault'] = 'تعيين كإفتراضي';
 $labels['autodetect'] = 'آلي';
 $labels['language'] = 'اللغة';
@@ -223,19 +262,46 @@ $labels['ignore'] = 'تجاهلها';
 $labels['readwhendeleted'] = 'حدد الرسالة كمقروءة عند حذفها';
 $labels['flagfordeletion'] = 'ضع علامة على الرسالة لحذفها بدلاً من حذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
+$labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلى المهملات';
+$labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
+$labels['fromknownsenders'] = 'للمرسلين المعلومين';
+$labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'أظهر الصّور المرفقة أسفل الرسالة';
 $labels['autosavedraft'] = 'حفظ المسودة تلقائياً';
 $labels['everynminutes'] = 'كل $n دقيقة';
 $labels['keepalive'] = 'تحقق من وجود رسائل جديدة عند';
 $labels['never'] = 'أبداً';
+$labels['immediately'] = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
 $labels['messagescomposition'] = 'إنشاء الرسائل';
 $labels['mimeparamfolding'] = 'أسماء الملفات المرفقة';
 $labels['2231folding'] = 'RFC 2231 بأكملها (ثندربيرد)';
 $labels['miscfolding'] = 'RFC 2047/2231 (ميكروسوفت آوتلوك)';
 $labels['2047folding'] = 'RFC 2047 بأكملها (غيرها)';
+$labels['force7bit'] = 'استخدام ترميز MIME للحروف ذات الثمانية بتّات';
 $labels['advancedoptions'] = 'خيارات متقدّمة';
 $labels['focusonnewmessage'] = 'وجّه نافذة المتصفح عند وجود رسالة جديدة';
+$labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميع المجلدات';
+$labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقل الرسالة الحالية';
+$labels['mainoptions'] = 'الخيارات الأساسية';
+$labels['section'] = 'قسم';
+$labels['maintenance'] = 'الصيانة';
+$labels['newmessage'] = 'رسالة جديدة';
+$labels['listoptions'] = 'خيارات السرد';
+$labels['signatureoptions'] = 'خيارات التوقيع';
+$labels['whenreplying'] = 'عند الرد';
+$labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
+$labels['replybottomposting'] = 'بدء رسالة جديدة ووضع النص أسفل الأصلية';
+$labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة عند الرد';
+$labels['autoaddsignature'] = 'إضافة التوقيع آلياً';
+$labels['newmessageonly'] = 'الرسالة الجديدة فقط';
+$labels['replyandforwardonly'] = 'الردود والتمريرات فقط';
+$labels['replysignaturepos'] = 'إضافة التوقيع عند الرد أو التمرير';
+$labels['belowquote'] = 'بعد الاقتباس';
+$labels['abovequote'] = 'قبل الاقتباس';
+$labels['insertsignature'] = 'إضافة التوقيع';
+$labels['previewpanemarkread'] = 'تحديد الرسائل المُعاينة كمقروءة';
+$labels['afternseconds'] = 'بعد $n ثواني';
 $labels['folder'] = 'مجلد';
 $labels['folders'] = 'مجلدات';
 $labels['foldername'] = 'اسم المجلد';
@@ -255,5 +321,23 @@ $labels['B'] = 'ب';
 $labels['KB'] = 'ك.ب';
 $labels['MB'] = 'م.ب';
 $labels['GB'] = 'ج.ب';
+$labels['unicode'] = 'يونيكود';
+$labels['english'] = 'الانجليزية';
+$labels['westerneuropean'] = 'الغرب أوروبية';
+$labels['easterneuropean'] = 'الشرق أوروبية';
+$labels['southeasterneuropean'] = 'الجنوب شرق أوروبية';
+$labels['baltic'] = 'البلطيقية';
+$labels['cyrillic'] = 'الكيريلية';
+$labels['arabic'] = 'العربية';
+$labels['greek'] = 'اليونانية';
+$labels['hebrew'] = 'العبرية';
+$labels['turkish'] = 'التركية';
+$labels['nordic'] = 'النرويجية';
+$labels['thai'] = 'التايلندية';
+$labels['celtic'] = 'الكلتية';
+$labels['vietnamese'] = 'الفيتنامية';
+$labels['japanese'] = 'اليابانية';
+$labels['korean'] = 'الكورية';
+$labels['chinese'] = 'الصينية';
 
 ?>
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 9543975ca..a2f56b41d 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -6,7 +6,7 @@
 | language/ar_SA/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -22,10 +22,13 @@ $messages['loginfailed'] = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غير صالحة';
 $messages['imaperror'] = 'فشل الاتصال بخادم IMAP';
+$messages['servererror'] = 'خطأ في الخادم!';
+$messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'لقد قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
 $messages['loading'] = 'جاري العمل...';
+$messages['uploading'] = 'جاري رفع الملف...';
 $messages['loadingdata'] = 'تحميل البيانات...';
 $messages['checkingmail'] = 'التحقق من وجود رسائل جديدة...';
 $messages['sendingmessage'] = 'إرسال الرسالة...';
@@ -44,7 +47,9 @@ $messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسا
 $messages['errorsavingsent'] = 'حدث خطأ أثناء حفظ الرسالة المُرسلة';
 $messages['errorsaving'] = 'حدث خطأ أثناء الحفظ';
 $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
+$messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
+$messages['errormarking'] = 'تعذر تحديد الرسائل';
 $messages['deletecontactconfirm'] = 'هل تريد حقاً حذف المراسلـ(ين) المحدد(ين)؟';
 $messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
 $messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
@@ -59,12 +64,13 @@ $messages['nonamewarning'] = 'الرجاء إدخال اسم';
 $messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
 $messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكتروني للمُرسل';
 $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
-$messages['nosubjectwarning'] = 'حقل \\\"الموضوع\\\" فارغ. هل تريد كتابة موضوع للرسالة؟';
+$messages['nosubjectwarning'] = 'حقل \\"الموضوع\\" فارغ. هل تريد كتابة موضوع للرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهل الرسالة؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
 $messages['nocontactsreturned'] = 'لم يعثر على أي مراسلين';
 $messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريد إلكتروني';
+$messages['notuploadedwarning'] = 'لم يتم رفع جميع المرفقات بعد. رجاءً الانتظار أو إلغاء عملية الرفع.';
 $messages['searchsuccessful'] = 'عثر على $nr رسائل';
 $messages['searchnomatch'] = 'لم يعثر على شيء';
 $messages['searching'] = 'جاري البحث...';
@@ -81,6 +87,7 @@ $messages['copyerror'] = 'لم يمكن نسخ أية عناوين';
 $messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
 $messages['errorsavingcontact'] = 'تعذر حفظ عنوان المراسل';
 $messages['movingmessage'] = 'جاري نقل الرسالة...';
+$messages['copyingmessage'] = 'جاري نسخ الرسالة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيد المتبقي.';
@@ -88,11 +95,23 @@ $messages['addsubfolderhint'] = 'سيتم إنشاء هذا المجلد كمج�
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
+$messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعة بنجاح';
+$messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعة بنجاح';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
 $messages['importerror'] = 'فشل الاستيراد! الملف المرفوع ليس ملف vCard صالح.';
 $messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل $skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
 $messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد في الهويّة المنتقاة';
 $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
+$messages['httpreceivedencrypterror'] = 'حدث خطأ جسيم في التهيئة. رجاءً اتصال بمدير الخادم حالاً. <b>لا يمكن إرسال بريدك.</b>';
+$messages['smtpconnerror'] = 'خطأ SMTP ($code): تعذر الاتصال بالخادم';
+$messages['smtpautherror'] = 'خطأ SMTP ($code): تعذر التحقق من هويتك';
+$messages['smtpfromerror'] = 'خطأ SMTP ($code): تعذر تحديد المرسل "$from"';
+$messages['smtptoerror'] = 'خطأ SMTP ($code): تعذرت إضافة المستلم "$to"';
+$messages['smtprecipientserror'] = 'خطأ SMTP: تعذرت قراءة قائمة المرسل إليهم';
+$messages['smtperror'] = 'خطأ SMTP: $msg';
+$messages['emailformaterror'] = 'عنوان بريد إلكتروني غير صالح: $email';
+$messages['toomanyrecipients'] = 'عدد المرسل إليهم كبير. قلص العدد إلى $max.';
+$messages['maxgroupmembersreached'] = 'عدد أعضاء المجموعة أكثر من $max';
 
 ?>
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 94d9c1e8f..783ed36ab 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -113,7 +113,7 @@ $messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remit
 $messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
-$messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduce el número de destinatarios a $max.';
+$messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
 
 ?>
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index be413754f..3b69dab51 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -1,19 +1,18 @@
 <?php
 
 /*
-
 +-----------------------------------------------------------------------+
-| language/fi/labels.inc                                                |
+| language/fi_FI/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Ville Alatalo <ville@alatalo.org>                             |
 |         Veljo Velling <veve@utu.fi>                                   |
 |         Jorma Tuomainen <jt@wiza.fi>                                  |
-|		  Olli <ollinpostit@gmail.com>
+|         Olli <ollinpostit@gmail.com>                                  |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -48,14 +47,14 @@ $labels['organization'] = 'Organisaatio';
 $labels['reply-to'] = 'Vastaus osoitteeseen';
 $labels['mailboxlist'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
+$labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
+$labels['copy'] = 'Kopioi';
+$labels['move'] = 'Siirrä';
 $labels['moveto'] = 'siirrä kansioon...';
 $labels['download'] = 'lataa';
 $labels['filename'] = 'Tiedoston nimi';
 $labels['filesize'] = 'Tiedoston koko';
-$labels['preferhtml'] = 'Käytä HTML:aa';
-$labels['htmlmessage'] = 'HTML-viesti';
-$labels['prettydate'] = 'Nätit päiväykset';
 $labels['addtoaddressbook'] = 'Lisää osoitekirjaan';
 $labels['sun'] = 'Su';
 $labels['mon'] = 'Ma';
@@ -123,12 +122,31 @@ $labels['messageactions'] = 'Lisää toimintoja...';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mitään';
+$labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
 $labels['unanswered'] = 'Vastaamaton';
 $labels['deleted'] = 'Poistettu';
 $labels['invert'] = 'Käännä';
 $labels['filter'] = 'Suodin';
+$labels['list'] = 'Listaus';
+$labels['threads'] = 'Viestiketjut';
+$labels['expand-all'] = 'Laajenna kaikki';
+$labels['expand-unread'] = 'Laajenna lukemattomat';
+$labels['collapse-all'] = 'Kutista kaikki';
+$labels['autoexpand_threads'] = 'Laajenna viestiketjut automaattisesti';
+$labels['do_expand'] = 'kaikki viestiketjut';
+$labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
+$labels['fromto'] = 'Lähettäjä/Vastaanottaja';
+$labels['attachment'] = 'Liite';
+$labels['nonesort'] = 'Ei mikään';
+$labels['sentdate'] = 'Lähetysaika';
+$labels['arrival'] = 'Saapumisaika';
+$labels['asc'] = 'nouseva';
+$labels['desc'] = 'laskeva';
+$labels['listcolumns'] = 'Näkyvät kentät';
+$labels['listsorting'] = 'Lajittelu kenttä';
+$labels['listorder'] = 'Lajittelu järjestys';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
 $labels['purge'] = 'Puhdista';
@@ -192,10 +210,13 @@ $labels['contactsfromto'] = 'Kontaktit $from-$to/$count';
 $labels['print'] = 'Tulosta';
 $labels['export'] = 'Vie (export)';
 $labels['exportvcards'] = 'Vie kontaktit vCard-muodossa';
+$labels['newcontactgroup'] = 'Luo uusi kontaktiryhmä';
+$labels['groupactions'] = 'Kontaktiryhmän toiminnot...';
 $labels['previouspage'] = 'Näytä edellinen luettelo';
 $labels['firstpage'] = 'Näytä ensimmäinen luettelo';
 $labels['nextpage'] = 'Näytä seuraava luettelo';
 $labels['lastpage'] = 'Näytä viimeinen luettelo';
+$labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
 $labels['import'] = 'Tuo';
@@ -213,6 +234,10 @@ $labels['manageidentities'] = 'Muokkaa tunnuksen identiteettejä';
 $labels['newidentity'] = 'Uusi identiteetti';
 $labels['newitem'] = 'Uusi';
 $labels['edititem'] = 'Muokkaa';
+$labels['preferhtml'] = 'Käytä HTML:aa';
+$labels['defaultcharset'] = 'Oletusmerkistökoodaus';
+$labels['htmlmessage'] = 'HTML-viesti';
+$labels['prettydate'] = 'Nätit päiväykset';
 $labels['setdefault'] = 'Aseta vakioksi';
 $labels['autodetect'] = 'Automaattinen';
 $labels['language'] = 'Kieli';
@@ -236,6 +261,7 @@ $labels['ignore'] = 'jätä huomiotta';
 $labels['readwhendeleted'] = 'Merkitse poistettavat viestit luetuiksi';
 $labels['flagfordeletion'] = 'Poistamisen sijaan, merkitse viestit poistettavaksi';
 $labels['skipdeleted'] = 'Älä näytä poistettuja viestejä';
+$labels['deletealways'] = 'Poista viestit, joiden siirtäminen roskakoriin epäonnistuu';
 $labels['showremoteimages'] = 'Näytä ulkopuoliset kuvat viestissä';
 $labels['fromknownsenders'] = 'tunnetuilta lähettäjiltä';
 $labels['always'] = 'aina';
@@ -244,12 +270,14 @@ $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';
 $labels['messagescomposition'] = 'Viestien kirjoittaminen';
 $labels['mimeparamfolding'] = 'Liitetiedostojen nimet';
 $labels['2231folding'] = 'Täysin RFC 2231 mukainen (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 mukainen (MS Outlook)';
 $labels['2047folding'] = 'Täysin RFC 2047 mukainen (muut)';
+$labels['force7bit'] = 'Käytä MIME-koodausta 8-bittisille merkeille';
 $labels['advancedoptions'] = 'Lisäasetukset';
 $labels['focusonnewmessage'] = 'Tarkenna selainikkuna uuteen viestiin';
 $labels['checkallfolders'] = 'Tarkista kaikki kansiot uusien viestien varalta';
@@ -271,6 +299,8 @@ $labels['replysignaturepos'] = 'Vastattaessa tai välitettäessä laita allekirj
 $labels['belowquote'] = 'lainauksen alle';
 $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
+$labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
+$labels['afternseconds'] = '$n sekunnin jälkeen';
 $labels['folder'] = 'Kansio';
 $labels['folders'] = 'Kansiot';
 $labels['foldername'] = 'Kansion nimi';
@@ -290,5 +320,23 @@ $labels['B'] = 't';
 $labels['KB'] = 'Kt';
 $labels['MB'] = 'Mt';
 $labels['GB'] = 'Gt';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Englantilainen';
+$labels['westerneuropean'] = 'Länsieurooppalainen';
+$labels['easterneuropean'] = 'Itäeurooppalainen';
+$labels['southeasterneuropean'] = 'Eteläeurooppalainen';
+$labels['baltic'] = 'Balttilainen';
+$labels['cyrillic'] = 'Kyrillinen';
+$labels['arabic'] = 'Arabialainen';
+$labels['greek'] = 'Kreikkalainen';
+$labels['hebrew'] = 'Heprealainen';
+$labels['turkish'] = 'Turkkilainen';
+$labels['nordic'] = 'Pohjoismaalainen';
+$labels['thai'] = 'Thaimaalainen';
+$labels['celtic'] = 'Kelttiläinen';
+$labels['vietnamese'] = 'Vietnamilainen';
+$labels['japanese'] = 'Japanilainen';
+$labels['korean'] = 'Korealainen';
+$labels['chinese'] = 'Kiinalainen';
 
 ?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index eaae576d4..a9b4a0121 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -1,12 +1,11 @@
 <?php
 
 /*
-
 +-----------------------------------------------------------------------+
-| language/fi/messages.inc                                              |
+| language/fi_FI/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -49,6 +48,7 @@ $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämist
 $messages['errorsavingsent'] = 'Lähetetyn viestin tallennuksessa tapahtui virhe';
 $messages['errorsaving'] = 'Tallennuksessa tapahtui virhe';
 $messages['errormoving'] = 'Viestiä ei voitu siirtää';
+$messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 $messages['errormarking'] = 'Viestiä ei voitu merkiä';
 $messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut kontaktit?';
@@ -88,6 +88,7 @@ $messages['copyerror'] = 'Yhtään osoitetta ei voitu kopioida';
 $messages['sourceisreadonly'] = 'Tämän osoitteen lähde on kirjoitussuojattu';
 $messages['errorsavingcontact'] = 'Yhteystietoa ei voitu tallentaa';
 $messages['movingmessage'] = 'Siirretään viestiä...';
+$messages['copyingmessage'] = 'Kopioidaan viestiä...';
 $messages['receiptsent'] = 'Lukukuittaus lähetetty onnistuneesti';
 $messages['errorsendingreceipt'] = 'Lukukuittausta ei voitu lähettää';
 $messages['nodeletelastidentity'] = 'Et voi poistaa tätä identiteettiä, koska se on ainoa jäljelläoleva';
@@ -95,6 +96,8 @@ $messages['addsubfolderhint'] = 'Uusi kansio luodaan valitun kansion alikansiona
 $messages['forbiddencharacter'] = 'Kansion nimessä on kiellettyjä merkkejä';
 $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
+$messages['contactaddedtogroup'] = 'Kontaktit lisätty ryhmään';
+$messages['contactremovedfromgroup'] = 'Kontaktit poistettu ryhmästä';
 $messages['importwait'] = 'Tuodaan, odota...';
 $messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard -muodossa.';
 $messages['importconfirm'] = '<b>$inserted kontaktia tuotu onnistuneesti $inserted kontaktioa, $skipped olemassaolevaa kontaktia hypättiin yli</b>:<p><em>$names</em></p>';
@@ -109,5 +112,7 @@ $messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisäämine
 $messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
 $messages['emailformaterror'] = 'Väärä sähköpostiosoite: $email';
+$messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
+$messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
 
 ?>
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 6b6171e1d..1f81bcb1d 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -5,7 +5,7 @@
 | language/gl_ES/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -42,14 +42,14 @@ $labels['organization'] = 'Organización';
 $labels['reply-to'] = 'Respostar a';
 $labels['mailboxlist'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes do $from ao $to de $count';
+$labels['threadsfromto'] = 'Fíos do $from ao $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
+$labels['copy'] = 'Copiar';
+$labels['move'] = 'Mover';
 $labels['moveto'] = 'Mover a...';
 $labels['download'] = 'Descargar';
 $labels['filename'] = 'Nome de ficheiro';
 $labels['filesize'] = 'Tamaño de ficheiro';
-$labels['preferhtml'] = 'Prefiro HTML';
-$labels['htmlmessage'] = 'Mensaxe HTML';
-$labels['prettydate'] = 'Data decorada';
 $labels['addtoaddressbook'] = 'Engadir ao caderno de enderezos';
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
@@ -117,12 +117,34 @@ $labels['messageactions'] = 'Máis accións...';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Ningunha';
+$labels['currpage'] = 'Páxina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Non respostadas';
 $labels['deleted'] = 'Eliminada';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtro';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Fíos';
+$labels['expand-all'] = 'Expandir todos';
+$labels['expand-unread'] = 'Expandir os non lidos';
+$labels['collapse-all'] = 'Contraer todos';
+$labels['threaded'] = 'Coma fíos de discusión';
+$labels['autoexpand_threads'] = 'Expandir os fíos das mensaxes';
+$labels['do_expand'] = 'tódolos fíos';
+$labels['expand_only_unread'] = 'só os que teñan mensaxes sen ler';
+$labels['fromto'] = 'Remitente/Destinatario';
+$labels['flag'] = 'Marca';
+$labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Ningunha';
+$labels['sentdate'] = 'Data de envío';
+$labels['arrival'] = 'Data de chegada';
+$labels['asc'] = 'ascendente';
+$labels['desc'] = 'descendente';
+$labels['listcolumns'] = 'Enumerar columnas';
+$labels['listsorting'] = 'Ordenar pola columna';
+$labels['listorder'] = 'Ordenación';
+$labels['listmode'] = 'Modo de vista da lista';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Baleirar';
 $labels['purge'] = 'Baleirar';
@@ -186,10 +208,13 @@ $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
 $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar os contactos en formato vCard';
+$labels['newcontactgroup'] = 'Crear novo grupo de contactos';
+$labels['groupactions'] = 'Accións cos grupos de contactos...';
 $labels['previouspage'] = 'Amosar o grupo anterior';
 $labels['firstpage'] = 'Amosar o primeiro grupo';
 $labels['nextpage'] = 'Amosar o seguinte grupo';
 $labels['lastpage'] = 'Amosar o último grupo';
+$labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Enderezos persoais';
 $labels['import'] = 'Importar';
@@ -207,6 +232,10 @@ $labels['manageidentities'] = 'Administrar as identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Editar';
+$labels['preferhtml'] = 'Prefiro HTML';
+$labels['defaultcharset'] = 'Xogo de caracteres por omisión';
+$labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['prettydate'] = 'Data decorada';
 $labels['setdefault'] = 'Usar coma predeterminada';
 $labels['autodetect'] = 'Detectar automáticamente';
 $labels['language'] = 'Linguaxe';
@@ -230,20 +259,23 @@ $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar a mensaxe coma lida ao eliminar';
 $labels['flagfordeletion'] = 'Marcar a mensaxe para eliminar no canto de eliminar';
 $labels['skipdeleted'] = 'Non amosar as mensaxes eliminadas';
+$labels['deletealways'] = 'Borrar as mensaxes aínda se non se poden gardar na papeleira';
 $labels['showremoteimages'] = 'Amosar imaxes anexas remotas';
 $labels['fromknownsenders'] = 'de remitentes coñecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Amosar as imaxes anexas baixo a mensaxe';
 $labels['autosavedraft'] = 'Gardar borrador automáticamente';
 $labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['keepalive'] = 'Procurar novas mensaxes en';
+$labels['keepalive'] = 'Procurar novas mensaxes';
 $labels['never'] = 'nunca';
+$labels['immediately'] = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualización das mensaxes';
 $labels['messagescomposition'] = 'Composición das mensaxes';
 $labels['mimeparamfolding'] = 'Nomes dos ficheiros anexos';
 $labels['2231folding'] = 'Conforme ao RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Conforme ao RFC 2047 (other)';
+$labels['force7bit'] = 'Usar MIME para codificar caracteres de 8 bits';
 $labels['advancedoptions'] = 'Opcións avanzadas';
 $labels['focusonnewmessage'] = 'Enfocar o navegador se hai mensaxes novas';
 $labels['checkallfolders'] = 'Procurar novas mensaxes en tódolos cartafoles';
@@ -265,6 +297,8 @@ $labels['replysignaturepos'] = 'Ao  respostar ou reenviar colocar a firma ';
 $labels['belowquote'] = 'embaixo do texto citado';
 $labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
+$labels['previewpanemarkread'] = 'Marcar como lidas as mensaxes previsualizadas';
+$labels['afternseconds'] = 'logo de $n segundos';
 $labels['folder'] = 'Cartafol';
 $labels['folders'] = 'Cartafoles';
 $labels['foldername'] = 'Nome do cartafol';
@@ -284,5 +318,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Inglés';
+$labels['westerneuropean'] = 'Europeo Occidental';
+$labels['easterneuropean'] = 'Europeo Oriental';
+$labels['southeasterneuropean'] = 'Europeo Suroriental';
+$labels['baltic'] = 'Báltico';
+$labels['cyrillic'] = 'Cirílico';
+$labels['arabic'] = 'Arábigo';
+$labels['greek'] = 'Grego';
+$labels['hebrew'] = 'Hebreo';
+$labels['turkish'] = 'Turco';
+$labels['nordic'] = 'Nórdico';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celta';
+$labels['vietnamese'] = 'Vietnamita';
+$labels['japanese'] = 'Xaponés';
+$labels['korean'] = 'Coreano';
+$labels['chinese'] = 'Chinés';
 
 ?>
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 50091267f..00d92a48a 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -5,7 +5,7 @@
 | language/gl_ES/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -43,9 +43,10 @@ $messages['sendingfailed'] = 'Fallou o envío da mensaxe';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundos antes de enviar esta mensaxe';
 $messages['errorsavingsent'] = 'Ocurriu un erro mentres se gardaba a mensaxe enviada';
 $messages['errorsaving'] = 'Ocurriu un erro mentres se gardaba';
-$messages['errormoving'] = 'Non se puido mover a mensaxe';
-$messages['errordeleting'] = 'Non se puido eliminar a mensaxe';
-$messages['errormarking'] = 'Non se puido marcar a mensaxe';
+$messages['errormoving'] = 'Non foi posible mover a(s) mensaxe(s)';
+$messages['errorcopying'] = 'Non foi posible copiar a(s) mensaxe(s)';
+$messages['errordeleting'] = 'Non foi posible eliminar a(s) mensaxe(s)';
+$messages['errormarking'] = 'Non foi posible marcar a(s) mensaxe(s)';
 $messages['deletecontactconfirm'] = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
 $messages['deletemessagesconfirm'] = 'Quere eliminar a(s) mensaxe(s) seleccionadas?';
 $messages['deletefolderconfirm'] = 'Quere eliminar este cartafol?';
@@ -75,34 +76,39 @@ $messages['nospellerrors'] = 'Non hai erros ortográficos';
 $messages['folderdeleted'] = 'Eliminouse correctamente o cartafol';
 $messages['deletedsuccessfully'] = 'Eliminouse correctamente';
 $messages['converting'] = 'Eliminando o formato da mensaxe...';
-$messages['messageopenerror'] = 'Non se puido cargar a mensaxe desde o servidor';
+$messages['messageopenerror'] = 'Non foi posible cargar a mensaxe desde o servidor';
 $messages['fileuploaderror'] = 'Fallou a carga do ficheiro';
 $messages['filesizeerror'] = 'O ficheiro cargado é máis grande que o tamaño máximo de $size';
 $messages['copysuccess'] = 'Copiáronse correctamente $nr enderezos';
-$messages['copyerror'] = 'Non se puido copiar ningún enderezo';
+$messages['copyerror'] = 'Non foi posible copiar ningún enderezo';
 $messages['sourceisreadonly'] = 'A orixe é de só lectura';
-$messages['errorsavingcontact'] = 'Non se puido gardar o contacto';
-$messages['movingmessage'] = 'Movendo mensaxe...';
+$messages['errorsavingcontact'] = 'Non foi posible gardar o contacto';
+$messages['movingmessage'] = 'Movendo a mensaxe...';
+$messages['copyingmessage'] = 'Copiando a mensaxe...';
 $messages['receiptsent'] = 'A notificación de disposición enviouse correctamente';
-$messages['errorsendingreceipt'] = 'Non se puido enviar a notificación de disposición';
+$messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación de disposición';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última';
 $messages['addsubfolderhint'] = 'Este cartafol vaise crear coma un subcartafol do seleccionado';
 $messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido';
 $messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar';
 $messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu';
+$messages['contactaddedtogroup'] = 'Engadíronse correctamente os contactos a este grupo';
+$messages['contactremovedfromgroup'] = 'Suprimíronse correctamente os contactos de este grupo';
 $messages['importwait'] = 'Estou a importar. Por favor, agarde...';
 $messages['importerror'] = 'Fallou a importación! O ficheiro que cargou non é un vCard correcto.';
 $messages['importconfirm'] = '<b>Importáronse correctamente $inserted contactos. Ignoráronse $skipped contactos que xa existían</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'Operación non permitida';
 $messages['nofromaddress'] = 'Falta o enderezo de correo electrónico na identidade que escolleu';
 $messages['editorwarning'] = 'Se troca neste intre ao editor de texto plano, vai perder todo o formato do texto. Quere continuar?';
-$messages['httpreceivedencrypterror'] = 'Produciuse un erro fatal de configuración. Contacte ao administrador inmediatamente. <b>Non se puido enviar a súa mensaxe.</b>';
+$messages['httpreceivedencrypterror'] = 'Produciuse un erro fatal de configuración. Contacte ao administrador inmediatamente. <b>Non foi posible enviar a súa mensaxe.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Fallou a conexión co servidor';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Fallou a autenticación';
-$messages['smtpfromerror'] = 'Erro SMTP ($code): Non se puido establecer o remitente "$from"';
-$messages['smtptoerror'] = 'Erro SMTP ($code): Non se puido engadir o destinatario "$to"';
+$messages['smtpfromerror'] = 'Erro SMTP ($code): Non foi posible establecer o remitente "$from"';
+$messages['smtptoerror'] = 'Erro SMTP ($code): Non foi posible engadir o destinatario "$to"';
 $messages['smtprecipientserror'] = 'Erro SMTP: Non se pode analizar a lista de destinatarios';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email';
+$messages['toomanyrecipients'] = 'Especificou demasiados destinatarios. Por favor, redúzaos a un máximo de $max.';
+$messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max.';
 
 ?>
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index a1d9e324a..4a19ff101 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -6,19 +6,20 @@
 | language/hu_HU/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Zark Bonfire (ikkhares@gmail.com)                             |
 |         Levente Farkas <lfarkas at lfarkas dot org>                   |
 |         Ervin Hegedűs <airween@damson.hu>                             |
+|         Barnabás Bóna <bsi at hosember dot hu>                        |
 +-----------------------------------------------------------------------+
 
 @version $Id$
 
 */
-	
+
 $labels = array();
 $labels['welcome'] = 'Üdvözli a $product';
 $labels['username'] = 'Felhasználónév';
@@ -47,14 +48,14 @@ $labels['organization'] = 'Szervezet';
 $labels['reply-to'] = 'Válaszcím';
 $labels['mailboxlist'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
-$labels['messagenrof'] = '$nr / $count üzenet';
+$labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
+$labels['messagenrof'] = '$nr / $coun t üzenet';
+$labels['copy'] = 'Másolás';
+$labels['move'] = 'Áthelyezés';
 $labels['moveto'] = 'áthelyezés...';
 $labels['download'] = 'letöltés';
 $labels['filename'] = 'Fájl neve';
 $labels['filesize'] = 'Fájl mérete';
-$labels['preferhtml'] = 'HTML megjelenítés';
-$labels['htmlmessage'] = 'HTML üzenet';
-$labels['prettydate'] = 'Rövid dátumok';
 $labels['addtoaddressbook'] = 'Hozzáadás a címjegyzékhez';
 $labels['sun'] = 'Vas';
 $labels['mon'] = 'Hét';
@@ -122,12 +123,34 @@ $labels['messageactions'] = 'További lehetőségek...';
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
+$labels['currpage'] = 'Aktuális oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
 $labels['unanswered'] = 'Megválaszolatlan';
 $labels['deleted'] = 'Törölt';
 $labels['invert'] = 'Invertálás';
 $labels['filter'] = 'Szűrés';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Témák';
+$labels['expand-all'] = 'Összes kibontása';
+$labels['expand-unread'] = 'Olvasatlanok kibontása';
+$labels['collapse-all'] = 'Összes összecsukása';
+$labels['threaded'] = 'Téma nézet';
+$labels['autoexpand_threads'] = 'Témák kibontása';
+$labels['do_expand'] = 'minden téma';
+$labels['expand_only_unread'] = 'csak ahol van olvasatlan üzenet';
+$labels['fromto'] = 'Feladó/Címzett';
+$labels['flag'] = 'Megjelölés';
+$labels['attachment'] = 'Csatolmány';
+$labels['nonesort'] = 'Nincs';
+$labels['sentdate'] = 'Feladva';
+$labels['arrival'] = 'Kézbesítve';
+$labels['asc'] = 'emelkedő';
+$labels['desc'] = 'csökkenő';
+$labels['listcolumns'] = 'Oszlopok listája';
+$labels['listsorting'] = 'Rendezési oszlop';
+$labels['listorder'] = 'Rendezésmód';
+$labels['listmode'] = 'Megjelenítési mód';
 $labels['compact'] = 'Tömörítés';
 $labels['empty'] = 'Kiürítés';
 $labels['purge'] = 'Tisztítás';
@@ -191,10 +214,13 @@ $labels['contactsfromto'] = 'Kapcsolatok: $from - $to / $count';
 $labels['print'] = 'Nyomtatás';
 $labels['export'] = 'Exportálás';
 $labels['exportvcards'] = 'Kapcsolatok exportálása vCard formátumban';
+$labels['newcontactgroup'] = 'Új csoport';
+$labels['groupactions'] = 'Műveletek csoportokkal...';
 $labels['previouspage'] = 'Előző lap';
 $labels['firstpage'] = 'Első lap';
 $labels['nextpage'] = 'Következő lap';
 $labels['lastpage'] = 'Utolsó lap';
+$labels['group'] = 'Csoportok';
 $labels['groups'] = 'Csoportok';
 $labels['personaladrbook'] = 'Személyes címjegyzék';
 $labels['import'] = 'Importálás';
@@ -212,6 +238,10 @@ $labels['manageidentities'] = 'Hozzáférés azonosítóinak kezelése';
 $labels['newidentity'] = 'Új azonosító';
 $labels['newitem'] = 'Új elem';
 $labels['edititem'] = 'Elem szerkesztése';
+$labels['preferhtml'] = 'HTML megjelenítés';
+$labels['defaultcharset'] = 'Alapértelmezett karakterkódolás';
+$labels['htmlmessage'] = 'HTML üzenet';
+$labels['prettydate'] = 'Rövid dátumok';
 $labels['setdefault'] = 'Beállítás alapértelmezettnek';
 $labels['autodetect'] = 'Automatikus';
 $labels['language'] = 'Nyelv';
@@ -235,6 +265,7 @@ $labels['ignore'] = 'hagyja figyelmen kívül';
 $labels['readwhendeleted'] = 'Üzenet olvasottként jelölése törléskor';
 $labels['flagfordeletion'] = 'Üzenet törlendőnek jelölése törlés helyett ';
 $labels['skipdeleted'] = 'Törölt üzenetek ne legyenek megjelenítve';
+$labels['deletealways'] = 'Üzenet törlése, ha nem sikerül áthelyezni a törölt elemek mappába';
 $labels['showremoteimages'] = 'Távoli beágyazott képek mutatása';
 $labels['fromknownsenders'] = 'csak ismert feladóktól';
 $labels['always'] = 'mindig';
@@ -243,12 +274,14 @@ $labels['autosavedraft'] = 'Automatikus piszkozat mentés';
 $labels['everynminutes'] = 'minden $n percben';
 $labels['keepalive'] = 'Új üzenetek keresése itt: ';
 $labels['never'] = 'soha';
+$labels['immediately'] = 'azonnal';
 $labels['messagesdisplaying'] = 'Üzenetek megjelenítése';
 $labels['messagescomposition'] = 'Üzenetek írása';
 $labels['mimeparamfolding'] = 'Csatolt állományok nevei';
 $labels['2231folding'] = 'Teljes RFC 2231 ( pl. Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (egyéb)';
+$labels['force7bit'] = 'MIME kódolás használata 8 bites karakterekhez';
 $labels['advancedoptions'] = 'Haladó beállítások';
 $labels['focusonnewmessage'] = 'Beérkező új üzenet ablakának fókuszba hozása';
 $labels['checkallfolders'] = 'Új üzenetek ellenőrzése minden (al)mappában';
@@ -270,6 +303,8 @@ $labels['replysignaturepos'] = 'Válasznál és továbbításnál kerüljön az
 $labels['belowquote'] = 'az idézett szöveg alá';
 $labels['abovequote'] = 'az idézett szöveg fölé';
 $labels['insertsignature'] = 'Aláírás beillesztése';
+$labels['previewpanemarkread'] = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
+$labels['afternseconds'] = '$n másodperc elteltével';
 $labels['folder'] = 'Mappa';
 $labels['folders'] = 'Mappák';
 $labels['foldername'] = 'Mappa neve';
@@ -289,5 +324,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Angol';
+$labels['westerneuropean'] = 'Nyugat-európai';
+$labels['easterneuropean'] = 'Kelet-európai';
+$labels['southeasterneuropean'] = 'Délkelet-európai';
+$labels['baltic'] = 'Balti';
+$labels['cyrillic'] = 'Cirill';
+$labels['arabic'] = 'Arab';
+$labels['greek'] = 'Görög';
+$labels['hebrew'] = 'Héber';
+$labels['turkish'] = 'Török';
+$labels['nordic'] = 'Skandináv';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Kelta';
+$labels['vietnamese'] = 'Vietnámi';
+$labels['japanese'] = 'Japán';
+$labels['korean'] = 'Koreai';
+$labels['chinese'] = 'Kínai';
 
 ?>
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 486553cd9..f00cc3d7d 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -6,13 +6,14 @@
 | language/hu_HU/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Zark Bonfire (ikkhares@gmail.com)                             |
 |         Levente Farkas <lfarkas at lfarkas dot org>                   |
 |         Ervin Hegedűs <airween@damson.hu>                             |
+|         Barnabás Bóna <bsi at hosember dot hu>                        |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -49,6 +50,7 @@ $messages['senttooquickly'] = 'Kérem várjon még $sec másodpercet az üzenet
 $messages['errorsavingsent'] = 'Hiba történt az elküldött üzenet mentése közben';
 $messages['errorsaving'] = 'A mentés során hiba lépett fel';
 $messages['errormoving'] = 'Az üzenetet nem sikerült áthelyezni';
+$messages['errorcopying'] = 'Az üzenetet nem sikerült másolni';
 $messages['errordeleting'] = 'Az üzenetet nem sikerült törölni';
 $messages['errormarking'] = 'Az üzenetet nem sikerült megjelölni';
 $messages['deletecontactconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt címe(ke)t?';
@@ -88,6 +90,7 @@ $messages['copyerror'] = 'Egyetlen cím sem másolható';
 $messages['sourceisreadonly'] = 'Ez a címforrás csak olvasható';
 $messages['errorsavingcontact'] = 'A kapcsolat címe nem menthető';
 $messages['movingmessage'] = 'Üzenet mozgatása...';
+$messages['copyingmessage'] = 'Üzenet másolása...';
 $messages['receiptsent'] = 'Az Olvasási Értesítés el lett küldve';
 $messages['errorsendingreceipt'] = 'Az Olvasási Értesítést nem sikerült elküldeni';
 $messages['nodeletelastidentity'] = 'Nem törölheti ezt a profilt, ez az egyetlen';
@@ -95,6 +98,8 @@ $messages['addsubfolderhint'] = 'Az új könyvtár az aktuálisan kiválasztott
 $messages['forbiddencharacter'] = 'A mappa neve tiltott karaktert tartalmaz';
 $messages['selectimportfile'] = 'Kérjük válassza ki a feltölteni kívánt fájlt';
 $messages['addresswriterror'] = 'A kiválasztott címjegyzék nem írható';
+$messages['contactaddedtogroup'] = 'A cím hozzáadása a csoporthoz sikeresen megtörtént';
+$messages['contactremovedfromgroup'] = 'A cím 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>';
@@ -109,5 +114,7 @@ $messages['smtptoerror'] = 'SMTP hiba ($code): Nem sikerült a következő címz
 $messages['smtprecipientserror'] = 'SMTP hiba ($code): A címzett lista feldolgozása sikertelen';
 $messages['smtperror'] = 'SMTP hiba ($code): $msg';
 $messages['emailformaterror'] = 'Helytelen formátumú e-mail cím: $email';
+$messages['toomanyrecipients'] = 'Túl sok a címzett. Csökkentse a címzettek számát $max címre.';
+$messages['maxgroupmembersreached'] = 'A csoport létszáma meghaladja a maximum $max címet.';
 
 ?>
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 2d638d774..13063b9b9 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -36,8 +36,8 @@ $rcube_languages = array(
   'br'	  => 'Breton (Brezhoneg)',
   'bg_BG' => 'Bulgarian (Български)',
   'ca_ES' => 'Catalan (Català)',
-  'zh_CN' => 'Chinese (普通话)',
-  'zh_TW' => 'Chinese (國語)',
+  'zh_CN' => 'Chinese (简体中文)',
+  'zh_TW' => 'Chinese (正體中文)',
   'hr_HR' => 'Croatian (Hrvatski)',
   'cs_CZ' => 'Czech (Česky)',
   'da_DK' => 'Danish (Dansk)',
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 7c5a0f31e..13de38551 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -6,7 +6,7 @@
 | language/ja_JP/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $labels['organization'] = '所属';
 $labels['reply-to'] = '返信先';
 $labels['mailboxlist'] = 'フォルダ一覧';
 $labels['messagesfromto'] = '表示中のメール: $from ～ $to (全: $count 件)';
-$labels['messagenrof'] = '現在のメール:$nr (全: $count 件)';
+$labels['threadsfromto'] = '表示中のスレッド: $from ～ $to (全: $count 件)';
+$labels['messagenrof'] = '現在のメール: $nr (全: $count 件)';
+$labels['copy'] = 'コピー';
+$labels['move'] = '移動';
 $labels['moveto'] = 'フォルダの移動';
 $labels['download'] = 'ダウンロード';
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイルサイズ';
-$labels['preferhtml'] = 'HTMLを表示';
-$labels['htmlmessage'] = 'HTMLメール';
-$labels['prettydate'] = '短い日付表示';
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
 $labels['sun'] = '日';
 $labels['mon'] = '月';
@@ -121,12 +121,34 @@ $labels['messageactions'] = 'その他の処理';
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
+$labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグあり';
 $labels['unanswered'] = '未返信';
 $labels['deleted'] = '削除済';
 $labels['invert'] = '反転';
 $labels['filter'] = 'フィルター';
+$labels['list'] = '一覧';
+$labels['threads'] = 'スレッド';
+$labels['expand-all'] = 'すべて展開';
+$labels['expand-unread'] = '未開封のメールを展開';
+$labels['collapse-all'] = 'すべて折りたたむ';
+$labels['threaded'] = 'スレッド化';
+$labels['autoexpand_threads'] = 'スレッドを展開';
+$labels['do_expand'] = 'すべてのスレッド';
+$labels['expand_only_unread'] = '未開封のメールのみ';
+$labels['fromto'] = '送信者 / 宛先';
+$labels['flag'] = 'フラグ';
+$labels['attachment'] = '添付ファイル';
+$labels['nonesort'] = 'なし';
+$labels['sentdate'] = '送信日';
+$labels['arrival'] = '受信日';
+$labels['asc'] = '昇順';
+$labels['desc'] = '降順';
+$labels['listcolumns'] = '列の一覧';
+$labels['listsorting'] = '整列基準';
+$labels['listorder'] = '整列順';
+$labels['listmode'] = '一覧表示モード';
 $labels['compact'] = 'コンパクト';
 $labels['empty'] = '空';
 $labels['purge'] = 'ごみ箱を空にする';
@@ -190,10 +212,13 @@ $labels['contactsfromto'] = '連絡先: $from ～ $to (全: $count 件)';
 $labels['print'] = '印刷';
 $labels['export'] = 'エクスポート';
 $labels['exportvcards'] = 'vCard形式でエクスポート';
+$labels['newcontactgroup'] = '連絡先グループの新規作成';
+$labels['groupactions'] = '連絡先グループの操作';
 $labels['previouspage'] = '前の一覧へ';
 $labels['firstpage'] = '最初の一覧へ';
 $labels['nextpage'] = '次の一覧へ';
 $labels['lastpage'] = '最後の一覧へ';
+$labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
 $labels['personaladrbook'] = '個人アドレス';
 $labels['import'] = 'インポート';
@@ -211,6 +236,10 @@ $labels['manageidentities'] = 'アカウントの個人情報管理';
 $labels['newidentity'] = '個人情報の新規作成';
 $labels['newitem'] = '新しい項目';
 $labels['edititem'] = '項目の編集';
+$labels['preferhtml'] = 'HTMLを表示';
+$labels['defaultcharset'] = '標準の文字セット';
+$labels['htmlmessage'] = 'HTMLメール';
+$labels['prettydate'] = '短い日付表示';
 $labels['setdefault'] = '標準の設定';
 $labels['autodetect'] = '自動識別';
 $labels['language'] = '言語';
@@ -234,6 +263,7 @@ $labels['ignore'] = '無視する';
 $labels['readwhendeleted'] = '削除したメールを既読にする';
 $labels['flagfordeletion'] = '実際に削除せずに削除済みフラグを付ける';
 $labels['skipdeleted'] = '削除済みメールを表示しない';
+$labels['deletealways'] = 'ごみ箱への移動に失敗したメールはすぐに削除';
 $labels['showremoteimages'] = '外部URLの画像をインライン表示する';
 $labels['fromknownsenders'] = '知り合いから';
 $labels['always'] = '常に';
@@ -241,13 +271,15 @@ $labels['showinlineimages'] = 'メールに添付された画像を表示する'
 $labels['autosavedraft'] = '自動的に下書きを保存';
 $labels['everynminutes'] = '$n 分毎';
 $labels['keepalive'] = '新着メールの確認間隔';
-$labels['never'] = 'しない';
+$labels['never'] = '確認しない';
+$labels['immediately'] = '今すぐ確認';
 $labels['messagesdisplaying'] = 'メールの表示';
 $labels['messagescomposition'] = 'メールの作成';
 $labels['mimeparamfolding'] = '添付ファイル名';
 $labels['2231folding'] = 'RFC 2231 準拠 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 準拠 (他のメーラー)';
+$labels['force7bit'] = 'マルチバイト文字列をMIMEエンコードする';
 $labels['advancedoptions'] = '高度な設定';
 $labels['focusonnewmessage'] = '新着メールが届いたらブラウザをアクティブ化';
 $labels['checkallfolders'] = 'すべてのフォルダで新着メールを表示';
@@ -269,6 +301,8 @@ $labels['replysignaturepos'] = '返信・転送時に署名を挿入する位置
 $labels['belowquote'] = '引用部の後';
 $labels['abovequote'] = '引用部の前';
 $labels['insertsignature'] = '署名の挿入';
+$labels['previewpanemarkread'] = '開封済みにする';
+$labels['afternseconds'] = '$n 秒後';
 $labels['folder'] = 'フォルダ';
 $labels['folders'] = 'フォルダ一覧';
 $labels['foldername'] = 'フォルダ名';
@@ -288,5 +322,23 @@ $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '英語';
+$labels['westerneuropean'] = '西ヨーロッパ言語';
+$labels['easterneuropean'] = '東ヨーロッパ言語';
+$labels['southeasterneuropean'] = '南東ヨーロッパ言語';
+$labels['baltic'] = 'バルト言語';
+$labels['cyrillic'] = 'キリル言語';
+$labels['arabic'] = 'アラビア語';
+$labels['greek'] = 'ギリシャ語';
+$labels['hebrew'] = 'ヘブライ語';
+$labels['turkish'] = 'トルコ語';
+$labels['nordic'] = '北欧言語';
+$labels['thai'] = 'タイ語';
+$labels['celtic'] = 'ケルト語';
+$labels['vietnamese'] = 'ベトナム語';
+$labels['japanese'] = '日本語';
+$labels['korean'] = '韓国語';
+$labels['chinese'] = '中国語';
 
 ?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 95e1c3b94..15271f253 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -6,7 +6,7 @@
 | language/ja_JP/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -48,6 +48,7 @@ $messages['senttooquickly'] = 'このメールを送信するまで $sec 秒 お
 $messages['errorsavingsent'] = '送信メールの保存中にエラーが発生しました。';
 $messages['errorsaving'] = '保存中にエラーが発生しました。';
 $messages['errormoving'] = 'メールを移動できません。';
+$messages['errorcopying'] = 'メールをコピーできません。';
 $messages['errordeleting'] = 'メールを削除できません。';
 $messages['errormarking'] = 'メールをマークできません。';
 $messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか？';
@@ -87,6 +88,7 @@ $messages['copyerror'] = 'アドレスをコピーできません。';
 $messages['sourceisreadonly'] = 'このアドレス情報は読取専用です。';
 $messages['errorsavingcontact'] = '連絡先のアドレスを保存できません。';
 $messages['movingmessage'] = 'メールを移動しています...';
+$messages['copyingmessage'] = 'メールをコピーしています...';
 $messages['receiptsent'] = '開封確認を送信しました。';
 $messages['errorsendingreceipt'] = '開封確認を送信できません。';
 $messages['nodeletelastidentity'] = '削除できません。少なくとも1つの個人情報が必要です。';
@@ -94,6 +96,8 @@ $messages['addsubfolderhint'] = '現在選択しているフォルダのサブ�
 $messages['forbiddencharacter'] = 'フォルダ名に利用できない文字が含まれています。';
 $messages['selectimportfile'] = 'アップロードするファイルを選択してください。';
 $messages['addresswriterror'] = '選択したアドレス帳に書き込めません。';
+$messages['contactaddedtogroup'] = 'グループに連絡先を追加しました。';
+$messages['contactremovedfromgroup'] = 'グループから連絡先を削除しました。';
 $messages['importwait'] = 'インポート中です。しばらくお待ちください...';
 $messages['importerror'] = 'インポートに失敗しました。アップロードしたファイルは不正な vCard ファイルです。';
 $messages['importconfirm'] = '<b>$inserted 件の連絡先をインポートしました。<br />既登録の連絡先 $skipped 件をスキップしました</b>：<p><em>$names</em></p>';
@@ -108,5 +112,7 @@ $messages['smtptoerror'] = 'SMTP Error ($code): 宛先 "$to" を追加できま�
 $messages['smtprecipientserror'] = 'SMTP Error: 宛先のリストを解析できません';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = '不正確なメールアドレスです: $email';
+$messages['toomanyrecipients'] = '宛先が多すぎます。$max 件以内にしてください。';
+$messages['maxgroupmembersreached'] = 'グループメンバーが多すぎます。$max 人以内にしてください。';
 
 ?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index a4a2a15d8..2d59f4b56 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -12,8 +12,8 @@
 +-----------------------------------------------------------------------+
 | Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
 | Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
-| Author: Odd Henriksen <odd@digicon.no>                                |
 | Author: Axel Sjøstedt <roundcube@sjostedt.no>                         |
+| Author: Odd Henriksen <odd@digicon.no>                                |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -48,14 +48,14 @@ $labels['organization'] = 'Organisasjon';
 $labels['reply-to'] = 'Svar til';
 $labels['mailboxlist'] = 'Mapper';
 $labels['messagesfromto'] = 'Meldinger $from til $to av $count';
-$labels['messagenrof'] = 'Meldinger $nr av $count';
+$labels['threadsfromto'] = 'Tråder $from til $to av $count';
+$labels['messagenrof'] = 'Melding $nr av $count';
+$labels['copy'] = 'Kopier';
+$labels['move'] = 'Flytt';
 $labels['moveto'] = 'flytt til...';
 $labels['download'] = 'last ned';
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
-$labels['preferhtml'] = 'Foretrekk HTML';
-$labels['htmlmessage'] = 'HTML-melding';
-$labels['prettydate'] = 'Pen datovisning';
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
@@ -123,12 +123,34 @@ $labels['messageactions'] = 'Flere valg...';
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
+$labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
 $labels['deleted'] = 'Slettet';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filter';
+$labels['list'] = 'Liste';
+$labels['threads'] = 'Tråder';
+$labels['expand-all'] = 'Utvid alle';
+$labels['expand-unread'] = 'Utvid uleste';
+$labels['collapse-all'] = 'Skjul alle';
+$labels['threaded'] = 'Trådet';
+$labels['autoexpand_threads'] = 'Utvid tråder';
+$labels['do_expand'] = 'alle tråder';
+$labels['expand_only_unread'] = 'kun med uleste meldinger';
+$labels['fromto'] = 'Avsender/Mottaker';
+$labels['flag'] = 'Flagg';
+$labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
+$labels['sentdate'] = 'Dato sendt';
+$labels['arrival'] = 'Dato mottatt';
+$labels['asc'] = 'stigende';
+$labels['desc'] = 'synkende';
+$labels['listcolumns'] = 'Listekolonner';
+$labels['listsorting'] = 'Sorteringskolonne';
+$labels['listorder'] = 'Sorteringsrekkefølge';
+$labels['listmode'] = 'Listevisningsmodus';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
 $labels['purge'] = 'Tøm';
@@ -192,10 +214,13 @@ $labels['contactsfromto'] = 'Kontakter $from til $to av $count';
 $labels['print'] = 'Skriv ut';
 $labels['export'] = 'Eksporter';
 $labels['exportvcards'] = 'Eksporter kontakter i vCard-format';
+$labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
+$labels['groupactions'] = 'Handlinger for kontaktgrupper...';
 $labels['previouspage'] = 'Vis forrige sett';
 $labels['firstpage'] = 'Vis første sett';
 $labels['nextpage'] = 'Vis neste sett';
 $labels['lastpage'] = 'Vis siste sett';
+$labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Egne adresser';
 $labels['import'] = 'Importer';
@@ -213,6 +238,10 @@ $labels['manageidentities'] = 'Administrer identitetene for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
 $labels['newitem'] = 'Nytt punkt';
 $labels['edititem'] = 'Rediger punkt';
+$labels['preferhtml'] = 'Foretrekk HTML';
+$labels['defaultcharset'] = 'Standard tegnsett';
+$labels['htmlmessage'] = 'HTML-melding';
+$labels['prettydate'] = 'Pen datovisning';
 $labels['setdefault'] = 'Sett som standard';
 $labels['autodetect'] = 'Auto';
 $labels['language'] = 'Språk';
@@ -236,6 +265,7 @@ $labels['ignore'] = 'ignorer';
 $labels['readwhendeleted'] = 'Merk melding som lest ved sletting';
 $labels['flagfordeletion'] = 'Flagg meldingen for sletting i stedet for å slette';
 $labels['skipdeleted'] = 'Ikke vis slettede meldinger';
+$labels['deletealways'] = 'Hvis en melding ikke kan flyttes til Slettet, slett den';
 $labels['showremoteimages'] = 'Vis bilder fra eksterne servere i meldinger';
 $labels['fromknownsenders'] = 'fra kjente avsendere';
 $labels['always'] = 'alltid';
@@ -244,12 +274,14 @@ $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';
 $labels['messagescomposition'] = 'Skriving av meldinger';
 $labels['mimeparamfolding'] = 'Vedleggsnavn';
 $labels['2231folding'] = 'Fullstendig RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Fullstendig RFC 2047 (andre)';
+$labels['force7bit'] = 'Bruk MIME-koding for 8-bit-tegn';
 $labels['advancedoptions'] = 'Avanserte alternativer';
 $labels['focusonnewmessage'] = 'Gi nettleservindu fokus ved nye meldinger';
 $labels['checkallfolders'] = 'Kontroller alle mapper for nye meldinger';
@@ -271,6 +303,8 @@ $labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresend
 $labels['belowquote'] = 'over sitert melding';
 $labels['abovequote'] = 'under sitert melding';
 $labels['insertsignature'] = 'Sett inn signatur';
+$labels['previewpanemarkread'] = 'Merk forhåndsviste meldinger som lest';
+$labels['afternseconds'] = 'etter $n sekunder';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
@@ -290,5 +324,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Engelsk';
+$labels['westerneuropean'] = 'Vesteuropeisk';
+$labels['easterneuropean'] = 'Østeuropeisk';
+$labels['southeasterneuropean'] = 'Sørøsteuropeisk';
+$labels['baltic'] = 'Baltisk';
+$labels['cyrillic'] = 'Cyrillisk';
+$labels['arabic'] = 'Arabisk';
+$labels['greek'] = 'Gresk';
+$labels['hebrew'] = 'Hebraisk';
+$labels['turkish'] = 'Tyrkisk';
+$labels['nordic'] = 'Nordisk';
+$labels['thai'] = 'Thailandsk';
+$labels['celtic'] = 'Keltisk';
+$labels['vietnamese'] = 'Vietnamesisk';
+$labels['japanese'] = 'Japansk';
+$labels['korean'] = 'Koreansk';
+$labels['chinese'] = 'Kinesisk';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 42d66dc66..6c495558a 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -12,8 +12,8 @@
 +-----------------------------------------------------------------------+
 | Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
 | Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
-| Author: Odd Henriksen <odd@digicon.no>                                |
 | Author: Axel Sjøstedt <roundcube@sjostedt.no>                         |
+| Author: Odd Henriksen <odd@digicon.no>                                |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -49,9 +49,10 @@ $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
 $messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
 $messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding';
 $messages['errorsaving'] = 'Det oppstod en feil ved lagring av data';
-$messages['errormoving'] = 'Kunne ikke flytte meldingen';
-$messages['errordeleting'] = 'Kunne ikke slette meldingen';
-$messages['errormarking'] = 'Kunne ikke markere meldingen';
+$messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
+$messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
+$messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
+$messages['errormarking'] = 'Kunne ikke markere meldingen(e)';
 $messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
 $messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
@@ -89,6 +90,7 @@ $messages['copyerror'] = 'Kunne ikke kopiere';
 $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
 $messages['errorsavingcontact'] = 'Kunne ikke lagre adressen';
 $messages['movingmessage'] = 'Flytter e-post...';
+$messages['copyingmessage'] = 'Kopierer e-post...';
 $messages['receiptsent'] = 'Kvittering er sent';
 $messages['errorsendingreceipt'] = 'Kunne ikke sende kvittering';
 $messages['nodeletelastidentity'] = 'Du kan ikke slette denne identiteten, det er din eneste.';
@@ -96,6 +98,8 @@ $messages['addsubfolderhint'] = 'Mappen vil bli opprettet som en undermappe av n
 $messages['forbiddencharacter'] = 'Mappenavnet inneholder tegn som ikke er tillatt';
 $messages['selectimportfile'] = 'Vennligst velg en fil for opplasting';
 $messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
+$messages['contactaddedtogroup'] = 'Kontaktene ble vellykket lagt til i denne gruppen';
+$messages['contactremovedfromgroup'] = 'Kontaktene ble vellykket fjernet fra denne gruppen';
 $messages['importwait'] = 'Importerer, vennligst vent...';
 $messages['importerror'] = 'Feil ved importering! Den opplastede filen er ikke en gyldig vCard-fil.';
 $messages['importconfirm'] = '<b>Importerte $inserted kontakter, hoppet over $skipped oppføringer som allerede eksisterte</b>: <p><em>$names</em></p>';
@@ -103,12 +107,14 @@ $messages['opnotpermitted'] = 'Handling ikke tillatt!';
 $messages['nofromaddress'] = 'E-postadresse mangler i valgt identitet';
 $messages['editorwarning'] = 'Ved å bytte for mat til ren tekst vil all tekstformatering gå tapt. Ønsker du å fortsette?';
 $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppsto. Vennligst kontakt systemansvarlig umiddelbart. <b>Din melding kunne ikke sendes.</b>';
-$messages['smtpconnerror'] = 'SMTP Feil ($code): Klarte ikke koble til server';
-$messages['smtpautherror'] = 'SMTP Feil ($code): Pålogging feilet';
-$messages['smtpfromerror'] = 'SMTP Feil ($code): Kunne ikke sette avsender "$from"';
-$messages['smtptoerror'] = 'SMTP Feil ($code): Kunne ikke legge til mottaker "$to"';
-$messages['smtprecipientserror'] = 'SMTP Feil ($code): Kunne ikke lese mottakerliste';
-$messages['smtperror'] = 'SMTP Feil ($code): $msg';
+$messages['smtpconnerror'] = 'SMTP-feil ($code): Klarte ikke koble til server';
+$messages['smtpautherror'] = 'SMTP-feil ($code): Pålogging feilet';
+$messages['smtpfromerror'] = 'SMTP-feil ($code): Kunne ikke sette avsender "$from"';
+$messages['smtptoerror'] = 'SMTP-feil ($code): Kunne ikke legge til mottaker "$to"';
+$messages['smtprecipientserror'] = 'SMTP-feil ($code): Kunne ikke lese mottakerliste';
+$messages['smtperror'] = 'SMTP-feil ($code): $msg';
 $messages['emailformaterror'] = 'Feil e-postadresse: $email';
+$messages['toomanyrecipients'] = 'For mange mottakere. Reduser antall mottakere til $max.';
+$messages['maxgroupmembersreached'] = 'Antall gruppemedlemmer overskrider maksgrensen på $max';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index ccbfad7c2..3f8c4c48a 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -46,14 +46,14 @@ $labels['organization'] = 'Organizaţie';
 $labels['reply-to'] = 'Răspunde la';
 $labels['mailboxlist'] = 'Dosare';
 $labels['messagesfromto'] = 'Mesaje de la $from până la $to din $count';
+$labels['threadsfromto'] = 'Grupuri de la $from până la $to din $count';
 $labels['messagenrof'] = '$nr mesaje din $count';
+$labels['copy'] = 'Copiază';
+$labels['move'] = 'Mută';
 $labels['moveto'] = 'Mută in...';
 $labels['download'] = 'Descarcă';
 $labels['filename'] = 'Nume fişier';
 $labels['filesize'] = 'Mărime fişier';
-$labels['preferhtml'] = 'Format HTML';
-$labels['htmlmessage'] = 'Mesaj HTML';
-$labels['prettydate'] = 'Dată formatată';
 $labels['addtoaddressbook'] = 'Adaugă în agendă';
 $labels['sun'] = 'Dum';
 $labels['mon'] = 'Lun';
@@ -121,12 +121,34 @@ $labels['messageactions'] = 'Mai multe acţiuni...';
 $labels['select'] = 'Selectează';
 $labels['all'] = 'Toate';
 $labels['none'] = 'Nici unul';
+$labels['currpage'] = 'Pagina curentă';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'Fără răspuns';
 $labels['deleted'] = 'Şterse';
 $labels['invert'] = 'Inversează';
 $labels['filter'] = 'Filtru';
+$labels['list'] = 'Listă';
+$labels['threads'] = 'Grupare după subiect';
+$labels['expand-all'] = 'Extinde toate';
+$labels['expand-unread'] = 'Extinde necitite';
+$labels['collapse-all'] = 'Compactează toate';
+$labels['threaded'] = 'Grupate';
+$labels['autoexpand_threads'] = 'Extinde mesajele grupate';
+$labels['do_expand'] = 'toate grupările';
+$labels['expand_only_unread'] = 'doar pe cele cu mesaje necitite';
+$labels['fromto'] = 'Expeditor/Destinatar';
+$labels['flag'] = 'Marcaj';
+$labels['attachment'] = 'Ataşament';
+$labels['nonesort'] = 'Fără sortare';
+$labels['sentdate'] = 'Data trimiterii';
+$labels['arrival'] = 'Data primirii';
+$labels['asc'] = 'ascendent';
+$labels['desc'] = 'descendent';
+$labels['listcolumns'] = 'Arată coloane';
+$labels['listsorting'] = 'Sortează după';
+$labels['listorder'] = 'Ordinea de sortare';
+$labels['listmode'] = 'Mod de vizualizare';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
 $labels['purge'] = 'Curăţă';
@@ -190,10 +212,13 @@ $labels['contactsfromto'] = 'Contacte de la $from până la $to din $count';
 $labels['print'] = 'Listează';
 $labels['export'] = 'Exportă';
 $labels['exportvcards'] = 'Exportă contactele în format vCard';
+$labels['newcontactgroup'] = 'Creează un nou grup de contacte';
+$labels['groupactions'] = 'Acţiuni pentru grupurile de contacte ...';
 $labels['previouspage'] = 'Pagina anterioară';
 $labels['firstpage'] = 'Arată primul set';
 $labels['nextpage'] = 'Pagina următoare';
 $labels['lastpage'] = 'Arată ultimul set';
+$labels['group'] = 'Grup';
 $labels['groups'] = 'Grupuri';
 $labels['personaladrbook'] = 'Adrese personale';
 $labels['import'] = 'Importă';
@@ -211,6 +236,10 @@ $labels['manageidentities'] = 'Administrează identităţi pentru acest cont';
 $labels['newidentity'] = 'Identitate nouă';
 $labels['newitem'] = 'Obiect nou';
 $labels['edititem'] = 'Editează obiect';
+$labels['preferhtml'] = 'Format HTML';
+$labels['defaultcharset'] = 'Set implicit de caractere';
+$labels['htmlmessage'] = 'Mesaj HTML';
+$labels['prettydate'] = 'Dată formatată';
 $labels['setdefault'] = 'Setează implicit';
 $labels['autodetect'] = 'Automat';
 $labels['language'] = 'Limba';
@@ -234,22 +263,25 @@ $labels['ignore'] = 'ignoră';
 $labels['readwhendeleted'] = 'Marchează mesajul ca şi citit la ştergere';
 $labels['flagfordeletion'] = 'Marchează mesajul pentru ştergere în loc de a-l şterge direct';
 $labels['skipdeleted'] = 'Nu arăta mesajele şterse';
+$labels['deletealways'] = 'Dacă mutarea mesajelor în coş eşuează, se vor şterge';
 $labels['showremoteimages'] = 'Arată imaginile care nu fac parte din e-mail';
 $labels['fromknownsenders'] = 'de la expeditori cunoscuţi';
 $labels['always'] = 'întotdeauna';
 $labels['showinlineimages'] = 'Arată imaginile ataşate sub mesaj';
 $labels['autosavedraft'] = 'Salvează ciorna automat';
-$labels['everynminutes'] = 'fiecare $n minut(e)';
+$labels['everynminutes'] = 'la fiecare $n minut(e)';
 $labels['keepalive'] = 'Verifică mesaje noi la';
 $labels['never'] = 'niciodată';
+$labels['immediately'] = 'imediat';
 $labels['messagesdisplaying'] = 'Afişarea mesajelor';
 $labels['messagescomposition'] = 'Compunerea mesajelor';
 $labels['mimeparamfolding'] = 'Nume ataşamente';
 $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (Altele)';
+$labels['force7bit'] = 'Foloseşte encodarea MIME pentru caracterele cu 8 biţi';
 $labels['advancedoptions'] = 'Opţiuni avansate';
-$labels['focusonnewmessage'] = 'Focus pe fereastra browser-ului la mesaje noi';
+$labels['focusonnewmessage'] = 'Focalizare pe fereastra browser-ului la mesaje noi';
 $labels['checkallfolders'] = 'Verifică toate dosarele pentru mesaje noi';
 $labels['displaynext'] = 'După ştergerea sau mutarea unui mesaj afişează-l pe următorul din listă';
 $labels['mainoptions'] = 'Opţiuni principale';
@@ -269,6 +301,8 @@ $labels['replysignaturepos'] = 'Când răspundeţi sau trimiteţi mai departe, s
 $labels['belowquote'] = 'dedesubtul citatului';
 $labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnătură';
+$labels['previewpanemarkread'] = 'Marchează mesajele previzualizate ca citite';
+$labels['afternseconds'] = 'după $n secunde';
 $labels['folder'] = 'Dosar';
 $labels['folders'] = 'Dosare';
 $labels['foldername'] = 'Nume dosar';
@@ -288,5 +322,23 @@ $labels['B'] = 'O';
 $labels['KB'] = 'KO';
 $labels['MB'] = 'MO';
 $labels['GB'] = 'GO';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Englezesc';
+$labels['westerneuropean'] = 'Europa de Vest';
+$labels['easterneuropean'] = 'Europa de Est';
+$labels['southeasterneuropean'] = 'Europa de Sud-Est';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Chirilic';
+$labels['arabic'] = 'Arab';
+$labels['greek'] = 'Grecesc';
+$labels['hebrew'] = 'Evreiesc';
+$labels['turkish'] = 'Turcesc';
+$labels['nordic'] = 'Ţările Nordice';
+$labels['thai'] = 'Tailandez';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamez';
+$labels['japanese'] = 'Japonez';
+$labels['korean'] = 'Coreean';
+$labels['chinese'] = 'Chinezesc';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index f614e0afe..c88f281e2 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -4,14 +4,14 @@
 +-----------------------------------------------------------------------+
 | language/ro_RO/messages.inc                                           |
 |                                                                       |
-| Language file of the RoundCube Webmail client                        |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
 |         Zeno Popovici <zeno.popovici at ulbsibiu.ro>                  |
-|		      Cristian Nastase <cristian.nastase@itcaffe.net>			         	|
+|         Cristian Nastase <cristian.nastase@itcaffe.net>               |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -47,9 +47,10 @@ $messages['sendingfailed'] = 'Nu s-a reuşit trimiterea mesajului';
 $messages['senttooquickly'] = 'Vă rugăm aşteptaţi $sec sec. înainte de a trimite acest mesaj';
 $messages['errorsavingsent'] = 'A intervenit o eroare în timp ce se efectua salvarea mesajului trimis';
 $messages['errorsaving'] = 'A intervenit o eroare în timp ce se efectua salvarea';
-$messages['errormoving'] = 'Nu s-a putut muta mesajul';
-$messages['errordeleting'] = 'Nu s-a putut şterge mesajul';
-$messages['errormarking'] = 'Nu s-a putut marca mesajul';
+$messages['errormoving'] = 'Mesajul(e) nu a(u) putut fi mutat(e)';
+$messages['errorcopying'] = 'Mesajul(e) nu a(u) putut fi copiat(e)';
+$messages['errordeleting'] = 'Mesajul(e) nu a(u) putut fi şters(e)';
+$messages['errormarking'] = 'Mesajul(e) nu a(u) putut fi marcat(e)';
 $messages['deletecontactconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
 $messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
 $messages['deletefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
@@ -87,6 +88,7 @@ $messages['copyerror'] = 'Nu s-a putut copia nicio adresă';
 $messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only"(se poate doar citi)';
 $messages['errorsavingcontact'] = 'Nu s-a putut salva adresa de contact';
 $messages['movingmessage'] = 'Mutare mesaj....';
+$messages['copyingmessage'] = 'Copiere mesaj...';
 $messages['receiptsent'] = 'Confirmarea de citire a fost trimisă cu succes';
 $messages['errorsendingreceipt'] = 'Confirmarea nu a putut fi trimisă';
 $messages['nodeletelastidentity'] = 'Nu puteţi şterge această identitate, este ultima.';
@@ -94,6 +96,8 @@ $messages['addsubfolderhint'] = 'Acest dosar va fi creat ca subdosar al celui se
 $messages['forbiddencharacter'] = 'Numele dosarului conţine un caracter nepermis.';
 $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru încărcare';
 $messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
+$messages['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';
@@ -108,5 +112,7 @@ $messages['smtptoerror'] = 'Eroare SMTP  ($code): Nu s-a putut adăuga destinata
 $messages['smtprecipientserror'] = 'Eroare SMTP: Nu s-a putut procesa lista cu destinatari';
 $messages['smtperror'] = 'Eroare SMTP: $msg';
 $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
+$messages['toomanyrecipients'] = 'Prea mulţi destinatari. Reduceţi numărul de destinatari la $max.';
+$messages['maxgroupmembersreached'] = 'Numărul de membri ai grupului depăşeşte maximul de $max.';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index bae628664..89da975ee 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -1,12 +1,11 @@
 <?php
 
 /*
-
 +-----------------------------------------------------------------------+
-| language/sl/labels.inc                                                |
+| language/sl_SI/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -273,6 +272,7 @@ $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';
 $labels['messagescomposition'] = 'Sestavljanje sporočil';
 $labels['mimeparamfolding'] = 'Imena priponk';
@@ -301,6 +301,8 @@ $labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporočila vstavi
 $labels['belowquote'] = 'pod citiran tekst';
 $labels['abovequote'] = 'nad citiran tekst';
 $labels['insertsignature'] = 'Vstavi podpis';
+$labels['previewpanemarkread'] = 'Označi predogledana sporočila kot prebrana';
+$labels['afternseconds'] = 'po $n sekundah';
 $labels['folder'] = 'Mapa';
 $labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 52fc4594d..88fccc1e2 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -2,14 +2,14 @@
 
 /*
 +-----------------------------------------------------------------------+
-| language/_NEW_/messages.inc                                           |
+| language/sl_SLI/messages.inc                                          |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008, RoundQube Dev. - Switzerland                      |
+| Copyright (C) 2008-2010, RoundQube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
-| Author:   Barbara Krasovec -  barbarak@arnes.si                                                            |
+| Author:   Barbara Krasovec -  barbarak@arnes.si                       |
 +-----------------------------------------------------------------------+
 
 */
@@ -108,5 +108,7 @@ $messages['smtptoerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektrons
 $messages['smtprecipientserror'] = 'Napaka pri pošiljanju: Seznama prejemnikov ni bilo mogoče razčleniti';
 $messages['smtperror'] = 'Napaka pri pošiljanju:$msg';
 $messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email';
+$messages['toomanyrecipients'] = 'Navedli ste preveč prejemnikov. Zmanjšajte število prejemnikov na $max';
+$messages['maxgroupmembersreached'] = 'Število članov skupine presega največje dovoljeno število $max.';
 
 ?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index c8d2b5555..df5d8b932 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -6,7 +6,7 @@
 | language/sv_SE/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -96,7 +96,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Idag';
 $labels['checkmail'] = 'Hämta nya meddelanden';
-$labels['writenewmessage'] = 'Skapa nytt meddelande';
+$labels['writenewmessage'] = 'Nytt meddelande';
 $labels['replytomessage'] = 'Svara avsändaren';
 $labels['replytoallmessage'] = 'Svara avsändaren och alla mottagare';
 $labels['forwardmessage'] = 'Vidarebefordra meddelande';
@@ -104,13 +104,13 @@ $labels['deletemessage'] = 'Radera meddelande';
 $labels['movemessagetotrash'] = 'Flytta meddelande till papperskorgen';
 $labels['printmessage'] = 'Skriv ut';
 $labels['previousmessage'] = 'Visa föregående meddelande';
-$labels['previousmessages'] = 'Visa tidigare grupp av meddelanden';
+$labels['previousmessages'] = 'Visa föregående sida';
 $labels['firstmessage'] = 'Visa första meddelandet';
-$labels['firstmessages'] = 'Visa första gruppen av meddelanden';
+$labels['firstmessages'] = 'Visa första sidan';
 $labels['nextmessage'] = 'Visa nästa meddelande';
-$labels['nextmessages'] = 'Visa nästa grupp av meddelanden';
+$labels['nextmessages'] = 'Visa nästa sida';
 $labels['lastmessage'] = 'Visa sista meddelandet';
-$labels['lastmessages'] = 'Visa sista gruppen av meddelanden';
+$labels['lastmessages'] = 'Visa sista sidan';
 $labels['backtolist'] = 'Tillbaka till meddelandelistan';
 $labels['viewsource'] = 'Visa källkod';
 $labels['markmessages'] = 'Märk meddelande';
@@ -122,7 +122,7 @@ $labels['messageactions'] = 'Hanteringsalternativ';
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
-$labels['currpage'] = 'Aktuell sida';
+$labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
@@ -136,20 +136,20 @@ $labels['expand-unread'] = 'Visa olästa';
 $labels['collapse-all'] = 'Dölj alla';
 $labels['threaded'] = 'Trådat';
 $labels['autoexpand_threads'] = 'Visa trådade meddelanden';
-$labels['do_expand'] = 'alla trådar';
-$labels['expand_only_unread'] = 'endast med olästa meddelanden';
+$labels['do_expand'] = 'Alla trådar';
+$labels['expand_only_unread'] = 'Trådar med olästa meddelanden';
 $labels['fromto'] = 'Avsändare/Mottagare';
 $labels['flag'] = 'Flagga';
 $labels['attachment'] = 'Bilaga';
 $labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Datum skickat';
 $labels['arrival'] = 'Datum mottaget';
-$labels['asc'] = 'stigande';
-$labels['desc'] = 'fallande';
-$labels['listcolumns'] = 'Listkolumner';
-$labels['listsorting'] = 'Sorteringskolumn';
-$labels['listorder'] = 'Sorteringsordning';
-$labels['listmode'] = 'Listvisningsläge';
+$labels['asc'] = 'Stigande';
+$labels['desc'] = 'Fallande';
+$labels['listcolumns'] = 'Kolumner';
+$labels['listsorting'] = 'Sortering';
+$labels['listorder'] = 'Ordning';
+$labels['listmode'] = 'Visningsläge';
 $labels['compact'] = 'Packa';
 $labels['empty'] = 'Töm';
 $labels['purge'] = 'Rensa';
@@ -162,7 +162,7 @@ $labels['searchmod'] = 'Sökalternativ';
 $labels['msgtext'] = 'Hela meddelandet';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
-$labels['compose'] = 'Skapa nytt meddelande';
+$labels['compose'] = 'Nytt meddelande';
 $labels['editasnew'] = 'Redigera som nytt';
 $labels['savemessage'] = 'Spara utkast';
 $labels['sendmessage'] = 'Skicka meddelande';
@@ -208,19 +208,19 @@ $labels['save'] = 'Spara';
 $labels['delete'] = 'Radera';
 $labels['newcontact'] = 'Ny kontakt';
 $labels['deletecontact'] = 'Radera vald kontakt';
-$labels['composeto'] = 'Skriv meddelande till vald kontakt';
+$labels['composeto'] = 'Nytt meddelande till vald kontakt';
 $labels['contactsfromto'] = 'Kontakt $from till $to av $count';
 $labels['print'] = 'Skriv ut';
 $labels['export'] = 'Exportera';
 $labels['exportvcards'] = 'Exportera kontakter';
-$labels['newcontactgroup'] = 'Skapa ny kontaktgrupp';
-$labels['groupactions'] = 'Åtgärder för kontaktgrupper...';
-$labels['previouspage'] = 'Visa föregående grupp';
-$labels['firstpage'] = 'Visa första gruppen';
-$labels['nextpage'] = 'Visa nästa grupp';
-$labels['lastpage'] = 'Visa sista gruppen';
+$labels['newcontactgroup'] = 'Ny kontaktgrupp';
+$labels['groupactions'] = 'Hantera kontaktgrupper';
+$labels['previouspage'] = 'Visa föregående sida';
+$labels['firstpage'] = 'Visa första sidan';
+$labels['nextpage'] = 'Visa nästa sida';
+$labels['lastpage'] = 'Visa sista sidan';
 $labels['group'] = 'Grupp';
-$labels['groups'] = 'Grupper';
+$labels['groups'] = 'Kontaktgrupper';
 $labels['personaladrbook'] = 'Personliga adresser';
 $labels['import'] = 'Importera';
 $labels['importcontacts'] = 'Importera kontakter';
@@ -235,8 +235,8 @@ $labels['editpreferences'] = 'Ändra användarinställningar';
 $labels['identities'] = 'Profiler';
 $labels['manageidentities'] = 'Hantera profiler för detta konto';
 $labels['newidentity'] = 'Ny profil';
-$labels['newitem'] = 'Ny post';
-$labels['edititem'] = 'Ändra post';
+$labels['newitem'] = 'Ny information';
+$labels['edititem'] = 'Ändra information';
 $labels['preferhtml'] = 'Visa meddelanden i HTML-format';
 $labels['defaultcharset'] = 'Förvald teckenkodning';
 $labels['htmlmessage'] = 'HTML-meddelande';
@@ -273,7 +273,7 @@ $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'] = 'omedelbart';
+$labels['immediately'] = 'Direkt';
 $labels['messagesdisplaying'] = 'Visning av meddelanden';
 $labels['messagescomposition'] = 'Redigering av meddelanden';
 $labels['mimeparamfolding'] = 'Kodning av namn på bifogade filer';
@@ -291,28 +291,28 @@ $labels['maintenance'] = 'Underhåll';
 $labels['newmessage'] = 'Nytt meddelande';
 $labels['listoptions'] = 'Listalternativ';
 $labels['signatureoptions'] = 'Signaturalternativ';
-$labels['whenreplying'] = 'När meddelanden besvaras';
-$labels['replytopposting'] = 'sätt in nytt meddelande ovanför befintligt';
-$labels['replybottomposting'] = 'sätt in nytt meddelande nedanför befintligt';
+$labels['whenreplying'] = 'Vid svar skriv nytt meddelande';
+$labels['replytopposting'] = 'Ovanför befintligt meddelande';
+$labels['replybottomposting'] = 'Nedanför befintligt meddelande';
 $labels['replyremovesignature'] = 'Ta bort befintlig signatur från meddelandet vid svar';
 $labels['autoaddsignature'] = 'Infoga signatur automatiskt';
-$labels['newmessageonly'] = 'endast vid nytt meddelande';
-$labels['replyandforwardonly'] = 'endast vid svar och vidarebefordran';
+$labels['newmessageonly'] = 'Vid nytt meddelande';
+$labels['replyandforwardonly'] = 'Vid svar och vidarebefordran';
 $labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
-$labels['belowquote'] = 'nedanför befintligt meddelande';
-$labels['abovequote'] = 'ovanför befintligt meddelande';
+$labels['belowquote'] = 'Nedanför befintligt meddelande';
+$labels['abovequote'] = 'Ovanför befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
-$labels['previewpanemarkread'] = 'Märk förhandsgranskat meddelande som läst';
-$labels['afternseconds'] = 'efter $n sekunder';
+$labels['previewpanemarkread'] = 'Märk meddelande som läst vid visning';
+$labels['afternseconds'] = 'Efter $n sekunder';
 $labels['folder'] = 'Katalog';
 $labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
 $labels['subscribed'] = 'Ansluten';
 $labels['messagecount'] = 'Meddelanden';
 $labels['create'] = 'Skapa';
-$labels['createfolder'] = 'Skapa ny katalog';
-$labels['rename'] = 'Byt namn';
-$labels['renamefolder'] = 'Byt katalognamn';
+$labels['createfolder'] = 'Ny katalog';
+$labels['rename'] = 'Ändra namn';
+$labels['renamefolder'] = 'Ändra katalognamn';
 $labels['deletefolder'] = 'Radera katalog';
 $labels['managefolders'] = 'Hantera kataloger';
 $labels['specialfolders'] = 'Speciella kataloger';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index a67c33539..58f0a57b3 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -6,7 +6,7 @@
 | language/sv_SE/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -47,9 +47,9 @@ $messages['contactnotfound'] = 'Den efterfrågade kontanten hittades inte';
 $messages['sendingfailed'] = 'Meddelandet kunde inte skickas';
 $messages['senttooquickly'] = 'Vänta ytterligare $sec sekunder med att skicka meddelandet';
 $messages['errorsavingsent'] = 'Ett fel inträffade när det skickade meddelandet sparades';
-$messages['errorsaving'] = 'Meddelandet kunde inte sparads';
+$messages['errorsaving'] = 'Meddelandet kunde inte sparas';
 $messages['errormoving'] = 'Meddelandet kunde inte flyttas';
-$messages['errorcopying'] = 'Kunde inte kopiera meddelande(n)';
+$messages['errorcopying'] = 'Meddelandet kunde inte kopieras';
 $messages['errordeleting'] = 'Meddelandet kunde inte raderas';
 $messages['errormarking'] = 'Meddelandet kunde inte markeras';
 $messages['deletecontactconfirm'] = 'Vill du verkligen radera valda kontakter?';
@@ -97,8 +97,8 @@ $messages['addsubfolderhint'] = 'Den här katalogen kommer att skapas som en und
 $messages['forbiddencharacter'] = 'Katalognamnet innehåller otillåtna tecken';
 $messages['selectimportfile'] = 'Välj en fil att ladda upp';
 $messages['addresswriterror'] = 'Angiven adressbok är skrivskyddad';
-$messages['contactaddedtogroup'] = 'Lyckades lägga till kontakt(erna) till den här gruppen';
-$messages['contactremovedfromgroup'] = 'Lyckades ta bort kontakt(erna) från den här gruppen';
+$messages['contactaddedtogroup'] = 'Kontakterna har lagts till i gruppen';
+$messages['contactremovedfromgroup'] = 'Kontakterna har tagits bort från gruppen';
 $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>';
@@ -113,7 +113,7 @@ $messages['smtptoerror'] = 'SMTP-fel ($code): Kan inte lägga till mottagaradres
 $messages['smtprecipientserror'] = 'SMTP-fel: Felaktigt formaterad lista med mottagaradresser';
 $messages['smtperror'] = 'SMTP-fel: $msg';
 $messages['emailformaterror'] = 'Felaktig adress: $email';
-$messages['toomanyrecipients'] = 'För många mottagare. Minska antalet mottagare till under $max st.';
-$messages['maxgroupmembersreached'] = 'Antalet medlemmar i kontaktgruppen överstiger det maximala antalet av $max';
+$messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max.';
+$messages['maxgroupmembersreached'] = 'Antalet gruppmedlemmar får inte överstiga $max';
 
 ?>