he_IL fr_FR cs_CZ nn_NO en_GB lt_LT et_EE it_IT sv_SE es_AR ru_RU es_ES pt_BR sl_SI ca_ES update

28 files changed, 607 insertions, 55 deletions

diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index bc68765f1..dbd7c6489 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -46,14 +46,14 @@ $labels['organization'] = 'Organització';
 $labels['reply-to'] = 'Respondre a';
 $labels['mailboxlist'] = 'Carpetes';
 $labels['messagesfromto'] = 'Missatges des de $from a $to de $count';
+$labels['threadsfromto'] = 'Fils $from a $to de $count';
 $labels['messagenrof'] = 'Missatge $nr de $count';
+$labels['copy'] = 'Copia';
+$labels['move'] = 'Mou';
 $labels['moveto'] = 'moure a...';
 $labels['download'] = 'descarregar';
 $labels['filename'] = 'Nom del fitxer';
 $labels['filesize'] = 'Grandària de fitxer';
-$labels['preferhtml'] = 'Preferisc HTML';
-$labels['htmlmessage'] = 'Missatge HTML';
-$labels['prettydate'] = 'Dates curtes';
 $labels['addtoaddressbook'] = 'Afegir a contactes';
 $labels['sun'] = 'DG';
 $labels['mon'] = 'DL';
@@ -121,12 +121,34 @@ $labels['messageactions'] = 'Més accions...';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
+$labels['currpage'] = 'Pàgina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
 $labels['deleted'] = 'Esborrat';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtre';
+$labels['list'] = 'Llista';
+$labels['threads'] = 'Fils';
+$labels['expand-all'] = 'Expandeix tots';
+$labels['expand-unread'] = 'Expandeix No llegits';
+$labels['collapse-all'] = 'Col·lapsa tots';
+$labels['threaded'] = 'Encadenat';
+$labels['autoexpand_threads'] = 'Expandeix els missatges encadenats';
+$labels['do_expand'] = 'tots els fils';
+$labels['expand_only_unread'] = 'només amb missatges no llegits';
+$labels['fromto'] = 'Remitent/Destinatari';
+$labels['flag'] = 'Marca';
+$labels['attachment'] = 'Adjunt';
+$labels['nonesort'] = 'Cap';
+$labels['sentdate'] = 'Data d\'enviament';
+$labels['arrival'] = 'Data d\'arribada';
+$labels['asc'] = 'ascendent';
+$labels['desc'] = 'descendent';
+$labels['listcolumns'] = 'Llista les columnes';
+$labels['listsorting'] = 'Columna d\'ordenació';
+$labels['listorder'] = 'Ordre d\'ordenació';
+$labels['listmode'] = 'Mode de vista de llista';
 $labels['compact'] = 'Compacta';
 $labels['empty'] = 'Buida';
 $labels['purge'] = 'Purga';
@@ -190,10 +212,13 @@ $labels['contactsfromto'] = 'Contactes $from a $to de $count';
 $labels['print'] = 'Imprimeix';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar contactes en format vCard';
+$labels['newcontactgroup'] = 'Crea un nou grup de contactes';
+$labels['groupactions'] = 'Accions per grups de contacte...';
 $labels['previouspage'] = 'Mostrar anteriors';
 $labels['firstpage'] = 'Mostrar primers';
 $labels['nextpage'] = 'Mostrar següents';
 $labels['lastpage'] = 'Mostrar últims';
+$labels['group'] = 'Grup';
 $labels['groups'] = 'Grups';
 $labels['personaladrbook'] = 'Llibreta d\'adreces';
 $labels['import'] = 'Importar';
@@ -211,6 +236,10 @@ $labels['manageidentities'] = 'Gestionar identitats per a aquest compte';
 $labels['newidentity'] = 'Nova identitat';
 $labels['newitem'] = 'Nou';
 $labels['edititem'] = 'Editar';
+$labels['preferhtml'] = 'Preferisc HTML';
+$labels['defaultcharset'] = 'Joc de caracters per defecte';
+$labels['htmlmessage'] = 'Missatge HTML';
+$labels['prettydate'] = 'Dates curtes';
 $labels['setdefault'] = 'Seleccionar opció per defecte';
 $labels['autodetect'] = 'Auto';
 $labels['language'] = 'Idioma';
@@ -234,6 +263,7 @@ $labels['ignore'] = 'Ignora-les';
 $labels['readwhendeleted'] = 'Marca el missatge com a llegit quan s\'esborri';
 $labels['flagfordeletion'] = 'Afegeix marca d\'esborrat en comptes d\'esborrar-lo';
 $labels['skipdeleted'] = 'No mostrar els missatges esborrats';
+$labels['deletealways'] = 'Si falla quan es mou un missatge a la Paperera, aleshores esborra\'l';
 $labels['showremoteimages'] = 'Mostrar imatges remotes sota el missatge';
 $labels['fromknownsenders'] = 'de remitent conegut';
 $labels['always'] = 'sempre';
@@ -242,12 +272,14 @@ $labels['autosavedraft'] = 'Desar esborrany automàticament';
 $labels['everynminutes'] = 'cada $n minut(s)';
 $labels['keepalive'] = 'Comprovar nous missatges a';
 $labels['never'] = 'mai';
+$labels['immediately'] = 'immediatament';
 $labels['messagesdisplaying'] = 'Vista de missatges';
 $labels['messagescomposition'] = 'Composició de missatges';
 $labels['mimeparamfolding'] = 'Noms dels adjunts';
 $labels['2231folding'] = 'Complet RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Complet RFC 2047 (un altre)';
+$labels['force7bit'] = 'Fes servir la codificació MIME per a caracters de 8-bits';
 $labels['advancedoptions'] = 'Opcions avançades';
 $labels['focusonnewmessage'] = 'Enviar el focus al navegador quan hi hagi un nou missatge';
 $labels['checkallfolders'] = 'Comprovar totes les carpetes per missatges nous';
@@ -257,6 +289,20 @@ $labels['section'] = 'Secció';
 $labels['maintenance'] = 'Manteniment';
 $labels['newmessage'] = 'Missatge nou';
 $labels['listoptions'] = 'Opcions de llista';
+$labels['signatureoptions'] = 'Opcions de signatura';
+$labels['whenreplying'] = 'Quan es respon';
+$labels['replytopposting'] = 'comença un nou missatge per sobre de l\'original';
+$labels['replybottomposting'] = 'comença un nou missatge per sota de l\'original';
+$labels['replyremovesignature'] = 'Quan es contesti, elimina la signatura original del missatge';
+$labels['autoaddsignature'] = 'Afegeix la signatura automàticament';
+$labels['newmessageonly'] = 'només missatge nou';
+$labels['replyandforwardonly'] = 'només respostes i reenviaments';
+$labels['replysignaturepos'] = 'Quan es contesti o reenviï, posa la signatura';
+$labels['belowquote'] = 'sota les cometes';
+$labels['abovequote'] = 'sobre les cometes';
+$labels['insertsignature'] = 'Inserta signatura';
+$labels['previewpanemarkread'] = 'Marca missatges previsualitzats com a llegits';
+$labels['afternseconds'] = 'després de $n segons';
 $labels['folder'] = 'Carpeta';
 $labels['folders'] = 'Carpetes';
 $labels['foldername'] = 'Nom de carpeta';
@@ -276,5 +322,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Anglés';
+$labels['westerneuropean'] = 'Europeu Occidental';
+$labels['easterneuropean'] = 'Europeu Oriental';
+$labels['southeasterneuropean'] = 'Europeu Sud-Oriental';
+$labels['baltic'] = 'Bàltic';
+$labels['cyrillic'] = 'Cirilic';
+$labels['arabic'] = 'Àrab';
+$labels['greek'] = 'Grec';
+$labels['hebrew'] = 'Hebreu';
+$labels['turkish'] = 'Turc';
+$labels['nordic'] = 'Nòrdic';
+$labels['thai'] = 'Tailandés';
+$labels['celtic'] = 'Celta';
+$labels['vietnamese'] = 'Vietnamita';
+$labels['japanese'] = 'Japonés';
+$labels['korean'] = 'Koreà';
+$labels['chinese'] = 'Xinés';
 
 ?>
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 9eb994ae2..547b2c6d5 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -48,6 +48,7 @@ $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar
 $messages['errorsavingsent'] = 'Va ocòrrer un error mentre es desava el missatge enviat';
 $messages['errorsaving'] = 'Va ocòrrer un error mentre es desava';
 $messages['errormoving'] = 'No s\'ha pogut moure el missatge';
+$messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s)';
 $messages['errordeleting'] = 'No s\'ha pogut eliminar el missatge';
 $messages['errormarking'] = 'No s\'ha pogut marcar el missatge.';
 $messages['deletecontactconfirm'] = 'Realment vol suprimir el(s) contacte(s) selecionat(s)?';
@@ -87,6 +88,7 @@ $messages['copyerror'] = 'No s\'ha pogut copiar cap adreça';
 $messages['sourceisreadonly'] = 'Aquesta adreça és només de lectura';
 $messages['errorsavingcontact'] = 'No s\'ha pogut guardar l\'adreça de contacte';
 $messages['movingmessage'] = 'Movent el missatge...';
+$messages['copyingmessage'] = 'Copiant missatge...';
 $messages['receiptsent'] = 'Confirmació de lectura enviada satisfactòriament';
 $messages['errorsendingreceipt'] = 'No es pot enviar la confirmació';
 $messages['nodeletelastidentity'] = 'No pots eliminar aquesta identitat, és l\'última.';
@@ -94,6 +96,8 @@ $messages['addsubfolderhint'] = 'Aquesta carpeta serà creada com a subcarpeta d
 $messages['forbiddencharacter'] = 'El nom de carpeta conté un caràcter prohibit';
 $messages['selectimportfile'] = 'Si us plau, seleccioneu un fitxer per pujar';
 $messages['addresswriterror'] = 'La llibreta d\'adreces seleccionada no és modificable';
+$messages['contactaddedtogroup'] = 'S\'han afegit correctament els contactes a aquest grup';
+$messages['contactremovedfromgroup'] = 'S\'han esborrat correctament els contactes d\'aquest grup';
 $messages['importwait'] = 'Important, espereu si us plau...';
 $messages['importerror'] = 'Importació fallida! El fitxer pujat no és un fitxer vCard vàlid';
 $messages['importconfirm'] = '<b>S\'han importat $inserted contactes satisfactòriament, s\'han descartat $skipped entrades ja existents</b>:<p><em>$names</em></p>';
@@ -108,5 +112,7 @@ $messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a
 $messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreça d\'e-mail incorrecte: $email';
+$messages['toomanyrecipients'] = 'Massa destinataris. Redueix el nombre de destinataris a $max.';
+$messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el màxim de $max.';
 
 ?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 8167a6e20..6005132e1 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -49,14 +49,14 @@ $labels['organization'] = 'Organizace';
 $labels['reply-to'] = 'Odpověď na';
 $labels['mailboxlist'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
+$labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
 $labels['messagenrof'] = 'Zpráva $nr z $count';
+$labels['copy'] = 'Kopírovat';
+$labels['move'] = 'Přesunout';
 $labels['moveto'] = 'přesunout do...';
 $labels['download'] = 'stáhnout';
 $labels['filename'] = 'Jméno přílohy';
 $labels['filesize'] = 'Velikost přílohy';
-$labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
-$labels['htmlmessage'] = 'HTML zpráva';
-$labels['prettydate'] = 'Hezčí datum';
 $labels['addtoaddressbook'] = 'Přidat do adresáře';
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
@@ -124,12 +124,34 @@ $labels['messageactions'] = 'Další akce ...';
 $labels['select'] = 'Vybrat';
 $labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
+$labels['currpage'] = 'Aktuální stránka';
 $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
 $labels['deleted'] = 'Smazané';
 $labels['invert'] = 'Převrátit';
 $labels['filter'] = 'Filtr';
+$labels['list'] = 'Seznam';
+$labels['threads'] = 'Konverzace';
+$labels['expand-all'] = 'Rozbalit všechny';
+$labels['expand-unread'] = 'Rozbalit nepřečtené';
+$labels['collapse-all'] = 'Sbalit všechny';
+$labels['threaded'] = 'Spojeno do konverzace';
+$labels['autoexpand_threads'] = 'Rozbalit zprávy konverzací';
+$labels['do_expand'] = 'všechny konverzace';
+$labels['expand_only_unread'] = 'pouze s nepřečtenými zprávami';
+$labels['fromto'] = 'Odesílatel/Příjemce';
+$labels['flag'] = 'Vlajka';
+$labels['attachment'] = 'Příloha';
+$labels['nonesort'] = 'Nic';
+$labels['sentdate'] = 'Datum odeslání';
+$labels['arrival'] = 'Datum přijetí';
+$labels['asc'] = 'vzestupně';
+$labels['desc'] = 'sestupně';
+$labels['listcolumns'] = 'Seznam sloupců';
+$labels['listsorting'] = 'Třídění sloupců';
+$labels['listorder'] = 'Uspořádání';
+$labels['listmode'] = 'Režim zobrazení seznamu';
 $labels['compact'] = 'Zmenšit';
 $labels['empty'] = 'Vymazat';
 $labels['purge'] = 'Vyprázdnit';
@@ -193,10 +215,13 @@ $labels['contactsfromto'] = 'Kontakty $from až $to z celkem $count';
 $labels['print'] = 'Tisk';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Exportovat kontakty ve formátu vCard';
+$labels['newcontactgroup'] = 'Vytvořit novou kontaktní skupinu';
+$labels['groupactions'] = 'Akce pro skupiny kontaktů...';
 $labels['previouspage'] = 'Předchozí';
 $labels['firstpage'] = 'Zobrazit první zprávy';
 $labels['nextpage'] = 'Další';
 $labels['lastpage'] = 'Zobrazit poslední zprávy';
+$labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobní kontakty';
 $labels['import'] = 'Import';
@@ -214,6 +239,10 @@ $labels['manageidentities'] = 'Spravovat profily u tohoto účtu';
 $labels['newidentity'] = 'Nový profil';
 $labels['newitem'] = 'Nová položka';
 $labels['edititem'] = 'Upravit položku';
+$labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
+$labels['defaultcharset'] = 'Výchozí kódování';
+$labels['htmlmessage'] = 'HTML zpráva';
+$labels['prettydate'] = 'Hezčí datum';
 $labels['setdefault'] = 'Nastavit výchozí';
 $labels['autodetect'] = 'Automaticky';
 $labels['language'] = 'Jazyk';
@@ -237,6 +266,7 @@ $labels['ignore'] = 'ignorovat';
 $labels['readwhendeleted'] = 'Při odstranění označit zprávu jako přečtenou';
 $labels['flagfordeletion'] = 'Zprávu nemazat, pouze označit pro odstranění';
 $labels['skipdeleted'] = 'Nezobrazovat smazané zprávy';
+$labels['deletealways'] = 'Při přesunu zpráv do koše selhává jejich smazání';
 $labels['showremoteimages'] = 'Zobrazovat obrázky uložené mimo mail';
 $labels['fromknownsenders'] = 'od známých uživatelů';
 $labels['always'] = 'vždy';
@@ -245,12 +275,14 @@ $labels['autosavedraft'] = 'Automaticky uložit rozepsané zprávy';
 $labels['everynminutes'] = 'každých $n minut';
 $labels['keepalive'] = 'Zkontrolovat nové zprávy';
 $labels['never'] = 'nikdy';
+$labels['immediately'] = 'ihned';
 $labels['messagesdisplaying'] = 'Zobrazování zpráv';
 $labels['messagescomposition'] = 'Psaní zpráv';
 $labels['mimeparamfolding'] = 'Jména příloh';
 $labels['2231folding'] = 'Podle RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Podle RFC 2047 (ostatní)';
+$labels['force7bit'] = 'Použít kódování MIME pro 8-bitové znaky';
 $labels['advancedoptions'] = 'Pokročilá nastavení';
 $labels['focusonnewmessage'] = 'Aktivovat okno prohlížeče při príchozí zprávě';
 $labels['checkallfolders'] = 'Kontrolovat nové zprávy ve všech složkách';
@@ -272,6 +304,8 @@ $labels['replysignaturepos'] = 'Při odpovídání nebo přeposílání zprávy
 $labels['belowquote'] = 'pod citaci';
 $labels['abovequote'] = 'nad citaci';
 $labels['insertsignature'] = 'Vložit podpis';
+$labels['previewpanemarkread'] = 'Označit zobrazené zprávy jako přečtené';
+$labels['afternseconds'] = 'po $n sekundách';
 $labels['folder'] = 'Složka';
 $labels['folders'] = 'Složky';
 $labels['foldername'] = 'Jméno složky';
@@ -291,5 +325,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Angličtina';
+$labels['westerneuropean'] = 'Západní Evropa';
+$labels['easterneuropean'] = 'Východní Evropa';
+$labels['southeasterneuropean'] = 'Jiho-Východní Evropa';
+$labels['baltic'] = 'Baltština';
+$labels['cyrillic'] = 'Cyrilice';
+$labels['arabic'] = 'Arabština';
+$labels['greek'] = 'Řečtina';
+$labels['hebrew'] = 'Hebrejština';
+$labels['turkish'] = 'Turečtina';
+$labels['nordic'] = 'Nordština';
+$labels['thai'] = 'Thajština';
+$labels['celtic'] = 'Keltština';
+$labels['vietnamese'] = 'Vietnamština';
+$labels['japanese'] = 'Japonština';
+$labels['korean'] = 'Korejština';
+$labels['chinese'] = 'Čínština';
 
 ?>
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index f9238ceb3..dc72dfcd7 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -13,6 +13,7 @@
 | Author: Martin Mrajca <martin@moonlake.cz>                            |
 |        joe <joe@humlak.cz>                                            |
 |        Jiri Kaderavek <jiri.kaderavek@webstep.net>                    |
+|        Ales Pospichal <ales@pospichalales.info>                       |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -49,6 +50,7 @@ $messages['senttooquickly'] = 'Prosím počkejte $sec sekund před odesláním z
 $messages['errorsavingsent'] = 'Nastala chyba při ukládání odeslané zprávy';
 $messages['errorsaving'] = 'Vyskytla se chyba při ukládání';
 $messages['errormoving'] = 'Nemohu přesunout zprávu';
+$messages['errorcopying'] = 'Nemohu zkopírovat zprávu';
 $messages['errordeleting'] = 'Nemohu smazat zprávu';
 $messages['errormarking'] = 'Zpráva nelze označit';
 $messages['deletecontactconfirm'] = 'Opravdu chcete smazat označené kontakty?';
@@ -88,6 +90,7 @@ $messages['copyerror'] = 'Nemohu zkopírovat žádnou adresu';
 $messages['sourceisreadonly'] = 'Tento zdroj adres je pouze pro čtení';
 $messages['errorsavingcontact'] = 'Nemohu uložit adresu kontaktu';
 $messages['movingmessage'] = 'Přesouvám zprávu...';
+$messages['copyingmessage'] = 'Kopíruji zprávu...';
 $messages['receiptsent'] = 'Potvrzení o přřijetí zprávy odesláno';
 $messages['errorsendingreceipt'] = 'Potvrzení o přijetí zprávy nebylo možné odeslat';
 $messages['nodeletelastidentity'] = 'Alespoň jedna identita musí být ponechána. Identitu nelze odstranit.';
@@ -95,6 +98,8 @@ $messages['addsubfolderhint'] = 'Tato složka bude vytvořena jako podsložka ak
 $messages['forbiddencharacter'] = 'Název složky obsahuje zakázaný znak';
 $messages['selectimportfile'] = 'Prosím vyberte soubor k nahrání';
 $messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný';
+$messages['contactaddedtogroup'] = 'Kontakty byly úspěšně přidány do této skupiny';
+$messages['contactremovedfromgroup'] = 'Kontakty byly odstraněny z této skupiny';
 $messages['importwait'] = 'Importuji, prosím čekejte...';
 $messages['importerror'] = 'Během importu nastala chyba! Nahraný soubor není ve formátu vCard.';
 $messages['importconfirm'] = '<b>Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno</b>:<p><em>$names</em></p>';
@@ -109,5 +114,7 @@ $messages['smtptoerror'] = 'Chyba SMTP ($code): Nelze přidat příjemce "$to"';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nelze zpracovat seznam příjemců';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
+$messages['toomanyrecipients'] = 'Příliš mnoho příjemců. Změňte počet příjemců na $max.';
+$messages['maxgroupmembersreached'] = 'Počet členských skupin dosáhl maximum z $max';
 
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index d137d4412..9b67d6ccf 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -42,21 +42,17 @@ $labels['date'] = 'Date';
 $labels['size'] = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisation';
-$labels['reply-to'] = $labels['replyto'];
+$labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['copy']     = 'Copy';
-$labels['move']     = 'Move';
+$labels['copy'] = 'Copy';
+$labels['move'] = 'Move';
 $labels['moveto'] = 'Move to...';
 $labels['download'] = 'Download';
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
-$labels['preferhtml'] = 'Display HTML';
-$labels['defaultcharset'] = 'Default Character Set';
-$labels['htmlmessage'] = 'HTML Message';
-$labels['prettydate'] = 'Pretty dates';
 $labels['addtoaddressbook'] = 'Add to address book';
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mon';
@@ -120,10 +116,11 @@ $labels['markread'] = 'As read';
 $labels['markunread'] = 'As unread';
 $labels['markflagged'] = 'As flagged';
 $labels['markunflagged'] = 'As unflagged';
-$labels['messageactions']   = 'More actions...';
+$labels['messageactions'] = 'More actions...';
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
@@ -159,8 +156,8 @@ $labels['unknown'] = 'unknown';
 $labels['unlimited'] = 'unlimited';
 $labels['quicksearch'] = 'Quick search';
 $labels['resetsearch'] = 'Reset search';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
+$labels['searchmod'] = 'Search modifiers';
+$labels['msgtext'] = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Save (.eml)';
 $labels['compose'] = 'Compose a message';
@@ -214,10 +211,13 @@ $labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print'] = 'Print';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['groupactions'] = 'Actions for contact groups...';
 $labels['previouspage'] = 'Show previous set';
 $labels['firstpage'] = 'Show first set';
 $labels['nextpage'] = 'Show next set';
 $labels['lastpage'] = 'Show last set';
+$labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
 $labels['personaladrbook'] = 'Personal Addresses';
 $labels['import'] = 'Import';
@@ -235,6 +235,10 @@ $labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'New identity';
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['prettydate'] = 'Pretty dates';
 $labels['setdefault'] = 'Set default';
 $labels['autodetect'] = 'Auto';
 $labels['language'] = 'Language';
@@ -267,6 +271,7 @@ $labels['autosavedraft'] = 'Automatically save draft';
 $labels['everynminutes'] = 'every $n minute(s)';
 $labels['keepalive'] = 'Check for new messages on';
 $labels['never'] = 'never';
+$labels['immediately'] = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Attachment names';
@@ -295,6 +300,8 @@ $labels['replysignaturepos'] = 'When replying or forwarding place signature';
 $labels['belowquote'] = 'below the quote';
 $labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread'] = 'Mark previewed messages as read';
+$labels['afternseconds'] = 'after $n seconds';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 0eaa214a5..49a975c83 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -2,18 +2,18 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/en_GB/messages.inc                                           |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Weiran Zhang (weiran@weiran.co.uk)                            |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/en_GB/messages.inc                                           |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Weiran Zhang (weiran@weiran.co.uk)                            |
++-----------------------------------------------------------------------+
 
- @version $Id$
+@version $Id$
 
 */
 
@@ -95,6 +95,8 @@ $messages['addsubfolderhint'] = 'This folder will be created as subfolder of the
 $messages['forbiddencharacter'] = 'Folder name contains a forbidden character';
 $messages['selectimportfile'] = 'Please select a file to upload';
 $messages['addresswriterror'] = 'The selected address book is not writeable';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group';
+$messages['contactremovedfromgroup'] = 'Successfully remove contacts from this group';
 $messages['importwait'] = 'Importing, please wait...';
 $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
@@ -109,5 +111,7 @@ $messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to"';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max';
 
 ?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 75232e625..52959327f 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -50,13 +50,12 @@ $labels['reply-to'] = 'Responder a';
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['moveto'] = 'mover a...';
-$labels['download'] = 'descargar';
+$labels['copy'] = 'Copiar';
+$labels['move'] = 'Mover';
+$labels['moveto'] = 'Mover a...';
+$labels['download'] = 'Descargar';
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
-$labels['preferhtml'] = 'Prefiero HTML';
-$labels['htmlmessage'] = 'Mensaje HTML';
-$labels['prettydate'] = 'Fecha detallada';
 $labels['addtoaddressbook'] = 'Añadir a contactos';
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
@@ -124,12 +123,23 @@ $labels['messageactions'] = 'Más acciones...';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
+$labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
 $labels['deleted'] = 'Eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
+$labels['expand-all'] = 'Expandir Todos';
+$labels['expand-unread'] = 'Expandir No Leidos';
+$labels['collapse-all'] = 'Colapsar Todos';
+$labels['expand_only_unread'] = 'solo con mensajes no leídos';
+$labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
+$labels['sentdate'] = 'Fecha de Enviado';
+$labels['arrival'] = 'Fecha de Recepción';
+$labels['asc'] = 'Ascendente';
+$labels['desc'] = 'Descendente';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 $labels['purge'] = 'Eliminar';
@@ -193,10 +203,13 @@ $labels['contactsfromto'] = 'Contactos $from a $to de $count';
 $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar contactos en format vCard';
+$labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
+$labels['groupactions'] = 'Acción para Grupos de Contacto';
 $labels['previouspage'] = 'Mostrar grupo anterior';
 $labels['firstpage'] = 'Mostrar primer grupo';
 $labels['nextpage'] = 'Mostrar siguiente grupo';
 $labels['lastpage'] = 'Mostrar último grupo';
+$labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
 $labels['import'] = 'Importar';
@@ -214,6 +227,10 @@ $labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
 $labels['newidentity'] = 'Nueva identidad';
 $labels['newitem'] = 'Nuevo';
 $labels['edititem'] = 'Editar';
+$labels['preferhtml'] = 'Prefiero HTML';
+$labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
+$labels['htmlmessage'] = 'Mensaje HTML';
+$labels['prettydate'] = 'Fecha detallada';
 $labels['setdefault'] = 'Seleccionar opción por defecto';
 $labels['autodetect'] = 'Automático';
 $labels['language'] = 'Idioma';
@@ -237,6 +254,7 @@ $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensage como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensage para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes eliminados';
+$labels['deletealways'] = 'Cuando no se pueda mover un mensaje a la papelera, eliminarlo';
 $labels['showremoteimages'] = 'Mostrar imágenes remotas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
@@ -245,12 +263,14 @@ $labels['autosavedraft'] = 'Guardar borrador automáticamente';
 $labels['everynminutes'] = 'cada $n minuto(s)';
 $labels['keepalive'] = 'Verificar si hay nuevos mensajes en';
 $labels['never'] = 'nunca';
+$labels['immediately'] = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombre de adjuntos';
 $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (Otro)';
+$labels['force7bit'] = 'Usar codificación MIME para caracteres de 8 bit';
 $labels['advancedoptions'] = 'Opciones Avanzadas';
 $labels['focusonnewmessage'] = 'Traer al frente la ventana del navegador cuando haya nuevos mensajes';
 $labels['checkallfolders'] = 'Verificar todas las carpetas por nuevos mensajes';
@@ -260,6 +280,20 @@ $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['listoptions'] = 'Opciones de Listado';
+$labels['signatureoptions'] = 'Opciones de Firma';
+$labels['whenreplying'] = 'Al Responder';
+$labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
+$labels['replybottomposting'] = 'iniciar el nuevo mensaje debajo del original';
+$labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje original';
+$labels['autoaddsignature'] = 'Agregar la firma automáticamente';
+$labels['newmessageonly'] = 'nuevos mensajes solamente';
+$labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
+$labels['replysignaturepos'] = 'Agregar firma al responder o reenviar';
+$labels['belowquote'] = 'debajo de la cita';
+$labels['abovequote'] = 'sobre la cita';
+$labels['insertsignature'] = 'Insertar firma';
+$labels['previewpanemarkread'] = 'Marcar mensajes previsualizados como leidos';
+$labels['afternseconds'] = 'despues de $n segundos';
 $labels['folder'] = 'Carpeta';
 $labels['folders'] = 'Carpetas';
 $labels['foldername'] = 'Nombre de carpeta';
@@ -279,5 +313,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Ingles';
+$labels['westerneuropean'] = 'Europa Occidental';
+$labels['easterneuropean'] = 'Europa del Este';
+$labels['southeasterneuropean'] = 'Sudeste de Europa';
+$labels['baltic'] = 'Báltico';
+$labels['cyrillic'] = 'Cirílico';
+$labels['arabic'] = 'Árabe';
+$labels['greek'] = 'Griego';
+$labels['hebrew'] = 'Hebreo';
+$labels['turkish'] = 'Turco';
+$labels['nordic'] = 'Nórdico';
+$labels['thai'] = 'Tailandés';
+$labels['celtic'] = 'Céltico';
+$labels['vietnamese'] = 'Vietnamita';
+$labels['japanese'] = 'Japonés';
+$labels['korean'] = 'Coreano';
+$labels['chinese'] = 'Chino';
 
 ?>
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 9c82a7580..2e0ac0e73 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -31,6 +31,7 @@ $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
 $messages['mailboxempty'] = 'La casilla está vacía';
 $messages['loading'] = 'Cargando...';
+$messages['uploading'] = 'Subiendo archivo...';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
@@ -48,7 +49,8 @@ $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de enviar este mensaje';
 $messages['errorsavingsent'] = 'Ocurrió un error al guardar el mensaje enviado';
 $messages['errorsaving'] = 'Ocurrió un error al guardar';
-$messages['errormoving'] = 'No se ha podido mover el mensaje';
+$messages['errormoving'] = 'No se pudo mover el mensaje';
+$messages['errorcopying'] = 'No se pudo copiar el mensaje';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
 $messages['errormarking'] = 'No se puede marcar el mensaje.';
 $messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
@@ -71,6 +73,7 @@ $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar
 $messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
 $messages['nocontactsreturned'] = 'No se han encontrado contactos';
 $messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
+$messages['notuploadedwarning'] = 'Todavia no se subieron todos los archivos adjuntos. Por favor aguarde o cancele la subida.';
 $messages['searchsuccessful'] = 'Se encontraron $nr mensajes';
 $messages['searchnomatch'] = 'La búsqueda no obtuvo resultados';
 $messages['searching'] = 'Buscando...';
@@ -87,6 +90,7 @@ $messages['copyerror'] = 'No se pudo copiar ninguna dirección';
 $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
+$messages['copyingmessage'] = 'Copiando mensaje...';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
@@ -94,6 +98,8 @@ $messages['addsubfolderhint'] = 'Esta carpeta se creará como una subcarpeta den
 $messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
 $messages['selectimportfile'] = 'Por favor, seleccione el archivo a subir';
 $messages['addresswriterror'] = 'La libreta de direcciones seleccionada es de solo-lectura';
+$messages['contactaddedtogroup'] = 'Contactos agregados al grupo correctamente';
+$messages['contactremovedfromgroup'] = 'Contactos eliminados del grupo correctamente';
 $messages['importwait'] = 'Importando, aguarde por favor...';
 $messages['importerror'] = 'Falló la importación! El archivo seleccionado parece no ser un archivo del tipo vCard válido.';
 $messages['importconfirm'] = '<b>Se importaron $inserted contactos correctamente. $skipped ya existentes fueron ignorados</b>:<p><em>$names</em></p>';
@@ -107,5 +113,8 @@ $messages['smtpfromerror'] = 'Error SMTP ($code): No se pudo establecer el remit
 $messages['smtptoerror'] = 'Error SMTP ($code): No se puedo agregar el destinatario "$to"';
 $messages['smtprecipientserror'] = 'Error SMTP: No se pudo leer la lista de destinatarios';
 $messages['smtperror'] = 'Error SMTP: $msg';
+$messages['emailformaterror'] = 'La dirección $email no es válida';
+$messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
+$messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
 
 ?>
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 2625ca0a3..90eb12f56 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -47,7 +47,10 @@ $labels['organization'] = 'Organización';
 $labels['reply-to'] = 'Respuesta a';
 $labels['mailboxlist'] = 'Bandejas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
+$labels['threadsfromto'] = 'Hilos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
+$labels['copy'] = 'Copiar';
+$labels['move'] = 'Mover';
 $labels['moveto'] = 'Mover a...';
 $labels['download'] = 'Descargar';
 $labels['filename'] = 'Nombre del archivo';
@@ -119,12 +122,34 @@ $labels['messageactions'] = 'Más acciones...';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
+$labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
 $labels['unanswered'] = 'Sin respuesta';
 $labels['deleted'] = 'Eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Hilos';
+$labels['expand-all'] = 'Expandir todos';
+$labels['expand-unread'] = 'Expandir No leídos';
+$labels['collapse-all'] = 'Colapsar todos';
+$labels['threaded'] = 'Encadenados';
+$labels['autoexpand_threads'] = 'Expandir hilos de mensajes';
+$labels['do_expand'] = 'todos los hilos';
+$labels['expand_only_unread'] = 'solo con mensajes no leídos';
+$labels['fromto'] = 'Remitente/Destinatario';
+$labels['flag'] = 'Marca';
+$labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
+$labels['sentdate'] = 'Fecha de envío';
+$labels['arrival'] = 'Fecha de llegada';
+$labels['asc'] = 'ascendente';
+$labels['desc'] = 'descendente';
+$labels['listcolumns'] = 'Listar columnas';
+$labels['listsorting'] = 'Columna de ordenación';
+$labels['listorder'] = 'Orden de ordenación';
+$labels['listmode'] = 'Modo de vista de lista';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 $labels['purge'] = 'Eliminar';
@@ -188,10 +213,13 @@ $labels['contactsfromto'] = 'Contactos $from a $to de $count';
 $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar contactos en formato vCard';
+$labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
+$labels['groupactions'] = 'Acciones para grupos de contactos...';
 $labels['previouspage'] = 'Mostrar grupo anterior';
 $labels['firstpage'] = 'Mostrar primer grupo';
 $labels['nextpage'] = 'Mostrar grupo siguiente';
 $labels['lastpage'] = 'Mostrar último grupo';
+$labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
 $labels['import'] = 'Importar';
@@ -245,6 +273,7 @@ $labels['autosavedraft'] = 'Guardar borrador automáticamente';
 $labels['everynminutes'] = 'cada $n minuto(s)';
 $labels['keepalive'] = 'Comprobar mensajes en línea';
 $labels['never'] = 'nunca';
+$labels['immediately'] = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombres de archivos adjuntos';
@@ -256,7 +285,6 @@ $labels['advancedoptions'] = 'Opciones Avanzadas';
 $labels['focusonnewmessage'] = 'Activar la ventana del navegador en un mensaje nuevo';
 $labels['checkallfolders'] = 'Comprobar todas las carpetas para mensajes nuevos';
 $labels['displaynext'] = 'Mostrar el siguiente mensaje después de borrar/mover un mensaje';
-$labels['indexsort'] = 'Usar el índice de mensajes para ordenar por fecha';
 $labels['mainoptions'] = 'Opciones principales';
 $labels['section'] = 'Sección';
 $labels['maintenance'] = 'Mantenimiento';
@@ -274,6 +302,8 @@ $labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
 $labels['belowquote'] = 'abajo del texto seleccionado';
 $labels['abovequote'] = 'arriba del texto seleccionado';
 $labels['insertsignature'] = 'Insertar firma';
+$labels['previewpanemarkread'] = 'Marcar mensaje previsualizado como leído';
+$labels['afternseconds'] = 'después de $n segundos';
 $labels['folder'] = 'Bandeja';
 $labels['folders'] = 'Bandejas';
 $labels['foldername'] = 'Nombre de bandeja';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 0461d1192..94d9c1e8f 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -49,6 +49,7 @@ $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar
 $messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado';
 $messages['errorsaving'] = 'Ocurrió un error mientras se guardaba';
 $messages['errormoving'] = 'No se ha podido mover el mensaje';
+$messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s)';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
 $messages['errormarking'] = 'No se ha podido marcar el mensaje';
 $messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
@@ -88,6 +89,7 @@ $messages['copyerror'] = 'No se pudo copiar ninguna dirección';
 $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
+$messages['copyingmessage'] = 'Copiando mensaje...';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
@@ -95,6 +97,8 @@ $messages['addsubfolderhint'] = 'Esta carpeta se creará como una subcarpeta den
 $messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
 $messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
 $messages['addresswriterror'] = 'No se puede escribir la dirección de contacto seleccionada';
+$messages['contactaddedtogroup'] = 'Se han añadido correctamente los contactos a este grupo.';
+$messages['contactremovedfromgroup'] = 'Se han borrado correctamente los contactos de este grupo.';
 $messages['importwait'] = 'Importando, espere...';
 $messages['importerror'] = '¡Error al importar! Este archivo no es un formato válido vCard.';
 $messages['importconfirm'] = '<b>Se han insertado: $inserted contactos, y se han omitido: $skipped porque ya existían</b>:<p><em>$names</em></p>';
@@ -109,5 +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['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
 
 ?>
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index ecb4822a5..c341dbf77 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -45,14 +45,14 @@ $labels['organization'] = 'Organisatsioon';
 $labels['reply-to'] = 'Vastus aadressile';
 $labels['mailboxlist'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
+$labels['threadsfromto'] = 'Lõimed $from kuni $to, kokku $count';
 $labels['messagenrof'] = 'Kiri $nr, kokku $count';
+$labels['copy'] = 'Kopeeri';
+$labels['move'] = 'Liiguta';
 $labels['moveto'] = 'liiguta kausta...';
 $labels['download'] = 'lae arvutisse';
 $labels['filename'] = 'Faili nimi';
 $labels['filesize'] = 'Faili suurus';
-$labels['preferhtml'] = 'Eelista HTMLi';
-$labels['htmlmessage'] = 'HTML kirjad';
-$labels['prettydate'] = 'Kenad kuupäevad';
 $labels['addtoaddressbook'] = 'Lisa aadressiraamatusse';
 $labels['sun'] = 'P';
 $labels['mon'] = 'E';
@@ -120,12 +120,34 @@ $labels['messageactions'] = 'Veel tegevusi...';
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'mitte midagi';
+$labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'mitte loetud';
 $labels['flagged'] = 'Märgistatud';
 $labels['unanswered'] = 'Vastamata';
 $labels['deleted'] = 'Kustutatud';
 $labels['invert'] = 'Vaheta';
 $labels['filter'] = 'Filtreeri';
+$labels['list'] = 'Nimekiri';
+$labels['threads'] = 'Lõimed';
+$labels['expand-all'] = 'Laienda kõik';
+$labels['expand-unread'] = 'Laienda lugemata';
+$labels['collapse-all'] = 'Pane kõik kokku';
+$labels['threaded'] = 'Lõimedena';
+$labels['autoexpand_threads'] = 'Laienda kirjade lõimed';
+$labels['do_expand'] = 'kõik lõimed';
+$labels['expand_only_unread'] = 'ainult lugemata kirjadega';
+$labels['fromto'] = 'Saatja/Saaja';
+$labels['flag'] = 'Märgista';
+$labels['attachment'] = 'Manus';
+$labels['nonesort'] = 'Puudub';
+$labels['sentdate'] = 'Saatmise kuupäev';
+$labels['arrival'] = 'Saamise kuupäev';
+$labels['asc'] = 'kasvavalt';
+$labels['desc'] = 'kahanevalt';
+$labels['listcolumns'] = 'Näita veerge';
+$labels['listsorting'] = 'Järjestus veerg';
+$labels['listorder'] = 'Järjestus suund';
+$labels['listmode'] = 'Nimekirja vaatamis režiim';
 $labels['compact'] = 'Tihenda';
 $labels['empty'] = 'Tühjenda';
 $labels['purge'] = 'Puhasta';
@@ -189,10 +211,13 @@ $labels['contactsfromto'] = 'Kirjed $from kuni $to, kokku $count';
 $labels['print'] = 'Trüki';
 $labels['export'] = 'Ekspordi';
 $labels['exportvcards'] = 'Ekspordi kontaktid vCardi formaadis';
+$labels['newcontactgroup'] = 'Loo uus kontakti grupp';
+$labels['groupactions'] = 'Kontaktide grupi tegevused...';
 $labels['previouspage'] = 'Näita eelmist lehte';
 $labels['firstpage'] = 'Näita esimest komplekti';
 $labels['nextpage'] = 'Näita järgmist lehte';
 $labels['lastpage'] = 'Näita viimast komplekti';
+$labels['group'] = 'Grupp';
 $labels['groups'] = 'Grupid';
 $labels['personaladrbook'] = 'Isiklikud aadressid';
 $labels['import'] = 'Impordi';
@@ -210,6 +235,10 @@ $labels['manageidentities'] = 'Halda selle konto identiteete';
 $labels['newidentity'] = 'Uus identiteet';
 $labels['newitem'] = 'Uus sissekanne';
 $labels['edititem'] = 'Muuda sissekannet';
+$labels['preferhtml'] = 'Eelista HTMLi';
+$labels['defaultcharset'] = 'Vaikimisi mägistik';
+$labels['htmlmessage'] = 'HTML kirjad';
+$labels['prettydate'] = 'Kenad kuupäevad';
 $labels['setdefault'] = 'Muuda vaikeseadeks';
 $labels['autodetect'] = 'Automaatne';
 $labels['language'] = 'Keel';
@@ -233,6 +262,7 @@ $labels['ignore'] = 'ignoreeri';
 $labels['readwhendeleted'] = 'Märgi kiri kustutamisel loetuks';
 $labels['flagfordeletion'] = 'Kustutamise asemel märgi kiri kustutatavaks';
 $labels['skipdeleted'] = 'Ära näita kustutatud kirju';
+$labels['deletealways'] = 'Kui kirja prügikasti liigutamine nurjub siis kustuta need';
 $labels['showremoteimages'] = 'Näita kirjas kaugelt kaasatud pilte';
 $labels['fromknownsenders'] = 'tuntud saatjatelt';
 $labels['always'] = 'alati';
@@ -241,12 +271,14 @@ $labels['autosavedraft'] = 'Salvesta mustandid automaatselt';
 $labels['everynminutes'] = 'iga $n minuti tagant';
 $labels['keepalive'] = 'Kontrolli uusi kirju';
 $labels['never'] = 'mitte kunagi';
+$labels['immediately'] = 'koheselt';
 $labels['messagesdisplaying'] = 'Kirjade näitamine';
 $labels['messagescomposition'] = 'Kirja koostamine ';
 $labels['mimeparamfolding'] = 'Manuste nimed';
 $labels['2231folding'] = 'Täielik RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Täielik RFC 2047 (muu)';
+$labels['force7bit'] = '8-bitiste märkide puhul kasuta MIME kodeerimist';
 $labels['advancedoptions'] = 'Lisaseadistused';
 $labels['focusonnewmessage'] = 'Fokusseeri brauseri aken uue kirja korral';
 $labels['checkallfolders'] = 'Kontrolli uusi kirju kõigist kaustadest';
@@ -268,6 +300,8 @@ $labels['replysignaturepos'] = 'Vastates või edastades aseta allkiri';
 $labels['belowquote'] = 'tsiteeritu alla';
 $labels['abovequote'] = 'tsiteeritu peale';
 $labels['insertsignature'] = 'Sisesta allkiri';
+$labels['previewpanemarkread'] = 'Märgi eelvaadatud kirjad loetuks';
+$labels['afternseconds'] = 'peale $n sekundit';
 $labels['folder'] = 'Kaust';
 $labels['folders'] = 'Kaustad';
 $labels['foldername'] = 'Kausta nimi';
@@ -287,5 +321,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Inglise';
+$labels['westerneuropean'] = 'Lääne-euroopa';
+$labels['easterneuropean'] = 'Ida-euroopa';
+$labels['southeasterneuropean'] = 'Kagu-euroopa';
+$labels['baltic'] = 'Balti';
+$labels['cyrillic'] = 'Kirillitsa';
+$labels['arabic'] = 'Araabia';
+$labels['greek'] = 'Kreeka';
+$labels['hebrew'] = 'Heebrea';
+$labels['turkish'] = 'Türgi';
+$labels['nordic'] = 'Põhjamaa';
+$labels['thai'] = 'Tai';
+$labels['celtic'] = 'Keldi';
+$labels['vietnamese'] = 'Vietnami';
+$labels['japanese'] = 'Jaapani';
+$labels['korean'] = 'Korea';
+$labels['chinese'] = 'Hiina';
 
 ?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 3247ac416..317d94928 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -47,6 +47,7 @@ $messages['senttooquickly'] = 'Palun oota enne selle kirja saatmist $sec sekundi
 $messages['errorsavingsent'] = 'Saadetud kirja salvestamisel ilmnes tõrge';
 $messages['errorsaving'] = 'Salvestamise ajal ilmnes viga';
 $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
+$messages['errorcopying'] = 'Kirjasid ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
 $messages['errormarking'] = 'Kirja märkimine nurjus';
 $messages['deletecontactconfirm'] = 'Soovid valitud kontaktid kustutada ?';
@@ -86,6 +87,7 @@ $messages['copyerror'] = 'Ühegi aadressi kopeerimine ei õnnestunud ';
 $messages['sourceisreadonly'] = 'Aadressi asukohas puuduvad kirjutusõigused';
 $messages['errorsavingcontact'] = 'Kontakti aadressi salvestamine ebaõnnestus';
 $messages['movingmessage'] = 'Kirja liigutamine...';
+$messages['copyingmessage'] = 'Kirjade kopeerimine...';
 $messages['receiptsent'] = 'Kättesaamiskinnitus saadetud';
 $messages['errorsendingreceipt'] = 'Ei õnnestunud kättesaamiskinnitust saata';
 $messages['nodeletelastidentity'] = 'See identiteet on viimane ja seda ei saa kustutada.';
@@ -93,6 +95,8 @@ $messages['addsubfolderhint'] = 'See kataloog luuakse valitud kausta alamkataloo
 $messages['forbiddencharacter'] = 'Kausta nimi sisaldab keelatud sümbolit';
 $messages['selectimportfile'] = 'Palun vali üleslaadimiseks fail';
 $messages['addresswriterror'] = 'Valitud aadressiraamat pole kirjutatav';
+$messages['contactaddedtogroup'] = 'Õnnestus kontaktide lisamine siia gruppi';
+$messages['contactremovedfromgroup'] = 'Õnnestus kontaktide eemaldamine siit grupist';
 $messages['importwait'] = 'Importimine, palun oota...';
 $messages['importerror'] = 'Import nurjus! Üleslaaditud fail ei ole vCard formaadis.';
 $messages['importconfirm'] = '<b>Edukalt imporditud $inserted kontakti, $skipped olemasolevat sissekannet vahele jäetud</b>:<p><em>$names</em></p>';
@@ -107,5 +111,7 @@ $messages['smtptoerror'] = 'SMTP Tõrge ($code): "$to" saajaks määramine nurju
 $messages['smtprecipientserror'] = 'SMTP Tõrge: Saajate nimekirja parsimine nurjus';
 $messages['smtperror'] = 'SMTP Tõrge: $msg';
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
+$messages['toomanyrecipients'] = 'Liia palju kirjasaajaid. Vähenda kirja saajate hulka $max ni.';
+$messages['maxgroupmembersreached'] = 'Grupi liikmete arv ületab suurima lubatud $max';
 
 ?>
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 0a558d47d..4c2dcac7f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -10,7 +10,7 @@
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
-| Author: Joel S. <joel.s@spijoprod.net>                                |
+| Author: Joel S. <joel.s@spijoprod.com>                                |
 |         Jerome Lipowicz <jerome@yayel.com>                            |
 |         Maximilien Cuony <theglu@theglu.org>                          |
 +-----------------------------------------------------------------------+
@@ -48,6 +48,8 @@ $labels['reply-to'] = 'Répondre à';
 $labels['mailboxlist'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
+$labels['copy'] = 'Copier';
+$labels['move'] = 'Déplacer';
 $labels['moveto'] = 'Déplacer vers...';
 $labels['download'] = 'Télécharger';
 $labels['filename'] = 'Nom du fichier';
@@ -119,12 +121,30 @@ $labels['messageactions'] = 'Actions supplémentaires...';
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
+$labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
 $labels['unanswered'] = 'Non répondu';
 $labels['deleted'] = 'Supprimé';
 $labels['invert'] = 'Inverser';
 $labels['filter'] = 'Filtre';
+$labels['list'] = 'Lister';
+$labels['expand-all'] = 'Afficher Tous';
+$labels['expand-unread'] = 'Afficher Non-lus';
+$labels['collapse-all'] = 'Fermer Tous';
+$labels['expand_only_unread'] = 'uniquement avec des messages non-lus';
+$labels['fromto'] = 'Expéditeur/Destinataire';
+$labels['flag'] = 'Drapeau';
+$labels['attachment'] = 'Pièce jointe';
+$labels['nonesort'] = 'Aucun';
+$labels['sentdate'] = 'Date d\'envoi';
+$labels['arrival'] = 'Date d\'arrivée';
+$labels['asc'] = 'Ascendant';
+$labels['desc'] = 'Descendant';
+$labels['listcolumns'] = 'Lister les colonnes';
+$labels['listsorting'] = 'Colonne de tri';
+$labels['listorder'] = 'Ordre de tri';
+$labels['listmode'] = 'Mode d\'affichage de la liste';
 $labels['compact'] = 'Compacter';
 $labels['empty'] = 'Vider';
 $labels['purge'] = 'Purger';
@@ -188,10 +208,13 @@ $labels['contactsfromto'] = 'Contacts de $from à $to sur $count';
 $labels['print'] = 'Imprimer';
 $labels['export'] = 'Exporter';
 $labels['exportvcards'] = 'Exporter les contacts au format vCard';
+$labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
+$labels['groupactions'] = 'Actions pour les groupes de contacts';
 $labels['previouspage'] = 'Montrer page précédente';
 $labels['firstpage'] = 'Voir la première page';
 $labels['nextpage'] = 'Montrer page suivante';
 $labels['lastpage'] = 'Voir la dernière page';
+$labels['group'] = 'Groupe';
 $labels['groups'] = 'Groupes';
 $labels['personaladrbook'] = 'Adresses personnelles';
 $labels['import'] = 'Importer';
@@ -245,6 +268,7 @@ $labels['autosavedraft'] = 'Sauvegarde automatique des brouillons';
 $labels['everynminutes'] = 'toutes les $n minute(s)';
 $labels['keepalive'] = 'Chercher les nouveaux messages';
 $labels['never'] = 'jamais';
+$labels['immediately'] = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
 $labels['messagescomposition'] = 'Ecriture des messages';
 $labels['mimeparamfolding'] = 'Nom du fichier attaché';
@@ -256,7 +280,6 @@ $labels['advancedoptions'] = 'Options avancées';
 $labels['focusonnewmessage'] = 'Placer le focus sur la fenêtre quand un nouveau message arrive';
 $labels['checkallfolders'] = 'Vérifier tous les dossiers pour les nouveaux messages';
 $labels['displaynext'] = 'Après suppression/déplacement du message, afficher le message suivant';
-$labels['indexsort'] = 'Utiliser l\'index des messages pour trier par date';
 $labels['mainoptions'] = 'Options principales';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
@@ -274,6 +297,8 @@ $labels['replysignaturepos'] = 'En répondant ou en transférant, placer la sign
 $labels['belowquote'] = 'en-dessous de la citation';
 $labels['abovequote'] = 'au-dessus de la citation';
 $labels['insertsignature'] = 'Insérer la signature';
+$labels['previewpanemarkread'] = 'Marquer les messages prévisualisés comme lus';
+$labels['afternseconds'] = 'après $n secondes';
 $labels['folder'] = 'Dossier';
 $labels['folders'] = 'Dossiers';
 $labels['foldername'] = 'Nom du dossier';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 412d77ece..97590c44d 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -10,7 +10,7 @@
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
-| Author: Joel S. <joel.s@spijoprod.net>                                |
+| Author: Joel S. <joel.s@spijoprod.com>                                |
 |         Jerome Lipowicz <jerome@yayel.com>                            |
 |         Maximilien Cuony <theglu@theglu.org>                          |
 +-----------------------------------------------------------------------+
@@ -49,10 +49,11 @@ $messages['senttooquickly'] = 'Vous devez attendre $sec sec. pour envoyer le mes
 $messages['errorsavingsent'] = 'Une erreur est survenue pendant la sauvegarde du message envoyé';
 $messages['errorsaving'] = 'Une erreur a empêché la sauvegarde';
 $messages['errormoving'] = 'Impossible de déplacer le message';
+$messages['errorcopying'] = 'Le(s) message(s) n\'a/ont pas pu être copié(s)';
 $messages['errordeleting'] = 'Impossible d\'effacer le message';
 $messages['errormarking'] = 'Impossible de marquer le message';
 $messages['deletecontactconfirm'] = 'Voulez-vous vraiment effacer le(s) contact(s) sélectionné(s) ?';
-$messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer le(s) message(s) séléctionné(s) ?';
+$messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer le(s) message(s) sélectionné(s) ?';
 $messages['deletefolderconfirm'] = 'Voulez-vous vraiment effacer ce dossier ?';
 $messages['purgefolderconfirm'] = 'Voulez-vous vraiment effacer tous les messages de ce dossier ?';
 $messages['foldercreating'] = 'Création du dossier...';
@@ -81,13 +82,14 @@ $messages['folderdeleted'] = 'Dossier effacé';
 $messages['deletedsuccessfully'] = 'Supprimé(s) avec succès';
 $messages['converting'] = 'Suppression de la mise en forme...';
 $messages['messageopenerror'] = 'Impossible de charger le message depuis serveur';
-$messages['fileuploaderror'] = 'Transfert du fichier echoué';
+$messages['fileuploaderror'] = 'Transfert du fichier échoué';
 $messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size';
 $messages['copysuccess'] = 'Succès de la copie des $nr adresses';
 $messages['copyerror'] = 'Ne peut pas copier les adresses';
 $messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule';
 $messages['errorsavingcontact'] = 'Ne peut pas enregistrer l\'adresse du contact';
 $messages['movingmessage'] = 'Déplacement du message...';
+$messages['copyingmessage'] = 'Copie du message ...';
 $messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
 $messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
@@ -95,13 +97,15 @@ $messages['addsubfolderhint'] = 'Ce dossier sera créé comme sous-dossier de ce
 $messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit';
 $messages['selectimportfile'] = 'Veuillez sélectionner un fichier à envoyer';
 $messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné';
+$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe';
+$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe';
 $messages['importwait'] = 'Importation, veuillez patienter...';
 $messages['importerror'] = 'Importation échouée ! Le fichier envoyé n\'est pas un fichier vCard valide.';
 $messages['importconfirm'] = '<b>$inserted contacts importés avec succès, $skipped entrées existantes ignorées</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
 $messages['nofromaddress'] = 'Il manque une adresse e-mail dans l\'identitée sélectionnée';
 $messages['editorwarning'] = 'Passer à l\'éditeur texte seul causera la perte du formatage du texte. Voulez-vous continuer ?';
-$messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pû être envoyé.</b>';
+$messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pu être envoyé.</b>';
 $messages['smtpconnerror'] = 'Erreur SMTP ($code): Echec de la connexion au serveur';
 $messages['smtpautherror'] = 'Erreur SMTP ($code): Echec de l\'authentification';
 $messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from"';
@@ -109,5 +113,7 @@ $messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destin
 $messages['smtprecipientserror'] = 'Erreur SMTP: Impossible de lire la liste des destinataires';
 $messages['smtperror'] = 'Erreur SMTP: $msg';
 $messages['emailformaterror'] = 'Adresse email incorrecte: $email';
+$messages['toomanyrecipients'] = 'Trop de destinataires. Réduisez leur nombre à $max maximum.';
+$messages['maxgroupmembersreached'] = 'Le nombre de membres du groupe dépasse le maximum de $max.';
 
 ?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 7adecce7f..a84caa56f 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -11,7 +11,7 @@
 +-----------------------------------------------------------------------+
 | Author: Moshe Leibovitch  <moish@mln.co.il>                           |
 | Updates: Noor Dawod <noor@comrax.com>                                 |
-| Updates: Moshe Leibovitch  <moish@mln.co.il>  20032010                |
+| Updates: Moshe Leibovitch  <moish@mln.co.il>  09042010                |
 +-----------------------------------------------------------------------+
 */
 
@@ -118,6 +118,7 @@ $labels['messageactions'] = 'פעולות נוספות';
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
+$labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
 $labels['unanswered'] = 'לא נענה';
@@ -208,10 +209,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'] = 'ייבוא';
@@ -265,6 +269,7 @@ $labels['autosavedraft'] = 'שמירה אוטומטית של טיוטה';
 $labels['everynminutes'] = 'כל $n דקות';
 $labels['keepalive'] = 'בדיקת הגעה של הודעות חדשות';
 $labels['never'] = 'אף פעם';
+$labels['immediately'] = 'מיידית';
 $labels['messagesdisplaying'] = 'הצגת הודעות';
 $labels['messagescomposition'] = 'כתיבת הודעות';
 $labels['mimeparamfolding'] = 'שמות קבצים מצורפים';
@@ -293,6 +298,8 @@ $labels['replysignaturepos'] = 'במענה או בהעברת הודעה, החת�
 $labels['belowquote'] = 'בסוף ההודעה המקורית';
 $labels['abovequote'] = 'בתחילת ההודעה המקורית';
 $labels['insertsignature'] = 'שיבוץ חתימה';
+$labels['previewpanemarkread'] = 'סימון הודעה שנצפתה כנקראה';
+$labels['afternseconds'] = 'לאחר $n שניות';
 $labels['folder'] = 'תיק';
 $labels['folders'] = 'תיקים';
 $labels['foldername'] = 'שם תיק';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 671cdff3a..5df3b21cb 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -11,7 +11,7 @@
 +-----------------------------------------------------------------------+
 | Author: Moshe Leibovitch    <moish@mln.co.il>                         |
 | Updates: Noor Dawod <noor@comrax.com>                                 |
-| Updates: Moshe Leibovitch  <moish@mln.co.il>  20032010                |
+| Updates: Moshe Leibovitch  <moish@mln.co.il>  09042010                |
 +-----------------------------------------------------------------------+
 
 */
@@ -46,6 +46,7 @@ $messages['senttooquickly'] = 'נא להמתין $sec שניות לפני מסי
 $messages['errorsavingsent'] = 'נגרמה שגיאה במהלך שמירת ההודעה בתיק הודעות יוצאות';
 $messages['errorsaving'] = 'נגרמה שגיאה במהלך השמירה';
 $messages['errormoving'] = 'לא ניתן לתייק את ההודעה';
+$messages['errorcopying'] = 'העתקת ההודעות נכשלה';
 $messages['errordeleting'] = 'לא ניתן למחוק את ההודעה';
 $messages['errormarking'] = 'לא ניתן לסמן ההודעה';
 $messages['deletecontactconfirm'] = 'האם למחוק את איש הקשר?';
@@ -93,6 +94,8 @@ $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>';
@@ -107,5 +110,7 @@ $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/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index f86f0b5ad..2252a3a8f 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -1,4 +1,3 @@
-<!-- Update from SVN: it_IT/labels.inc-->
 <?php
 
 /*
@@ -47,7 +46,10 @@ $labels['organization'] = 'Società';
 $labels['reply-to'] = 'Rispondi a';
 $labels['mailboxlist'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
+$labels['threadsfromto'] = 'Thread da $from a $to di $count';
 $labels['messagenrof'] = 'Messaggio $nr di $count';
+$labels['copy'] = 'Copia';
+$labels['move'] = 'Sposta';
 $labels['moveto'] = 'Sposta in...';
 $labels['download'] = 'Download';
 $labels['filename'] = 'Nome file';
@@ -119,12 +121,24 @@ $labels['messageactions'] = 'Altre azioni...';
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
+$labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnati';
 $labels['unanswered'] = 'Senza risposta';
 $labels['deleted'] = 'Cancellato';
 $labels['invert'] = 'Inverti';
 $labels['filter'] = 'Filtra';
+$labels['expand-all'] = 'Espandi tutto';
+$labels['expand-unread'] = 'Espandi non letti';
+$labels['collapse-all'] = 'Richiudi tutti';
+$labels['do_expand'] = 'Tutti i thread';
+$labels['expand_only_unread'] = 'solo con messaggi non letti';
+$labels['fromto'] = 'Mittente/Destinatario';
+$labels['attachment'] = 'Allegato';
+$labels['sentdate'] = 'Data d\'invio';
+$labels['arrival'] = 'Data di arrivo';
+$labels['asc'] = 'Ascendente';
+$labels['desc'] = 'Discendente';
 $labels['compact'] = 'Compatta';
 $labels['empty'] = 'Svuota';
 $labels['purge'] = 'Pulisci';
@@ -188,10 +202,13 @@ $labels['contactsfromto'] = 'Contatti da $from a $to di $count';
 $labels['print'] = 'Stampa';
 $labels['export'] = 'Esporta';
 $labels['exportvcards'] = 'Esporta i contatti in formato vCard';
+$labels['newcontactgroup'] = 'Crea un nuovo gruppo';
+$labels['groupactions'] = 'Azioni per i gruppi';
 $labels['previouspage'] = 'Pagina precedente';
 $labels['firstpage'] = 'Prima pagina';
 $labels['nextpage'] = 'Pagina successiva';
 $labels['lastpage'] = 'Ultima pagina';
+$labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppi';
 $labels['personaladrbook'] = 'Rubrica Personale';
 $labels['import'] = 'Importa';
@@ -236,6 +253,7 @@ $labels['ignore'] = 'ignora';
 $labels['readwhendeleted'] = 'Marca il messaggio come letto prima di eliminarlo';
 $labels['flagfordeletion'] = 'Marca il messaggio come eliminato invece di eliminarlo';
 $labels['skipdeleted'] = 'Non mostrare i messaggi marcati come eliminati';
+$labels['deletealways'] = 'Quando non è possinile spostare i messaggi nel Cestino eliminali';
 $labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
 $labels['fromknownsenders'] = 'da mittenti conosciuti';
 $labels['always'] = 'sempre';
@@ -244,6 +262,7 @@ $labels['autosavedraft'] = 'Salva le bozze automaticamente';
 $labels['everynminutes'] = 'ogni $n minuto(i)';
 $labels['keepalive'] = 'Controlla la presenza di nuovi messaggi';
 $labels['never'] = 'mai';
+$labels['immediately'] = 'immediatamente';
 $labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
 $labels['messagescomposition'] = 'Composizione Messaggi';
 $labels['mimeparamfolding'] = 'Nomi allegati';
@@ -255,7 +274,6 @@ $labels['advancedoptions'] = 'Opzioni avanzate';
 $labels['focusonnewmessage'] = 'Attiva la finestra del browser all\'arrivo di un nuovo messaggio';
 $labels['checkallfolders'] = 'Controlla tutte le cartelle per la presenza di nuovi messaggi';
 $labels['displaynext'] = 'Dopo aver cancellato/spostato il messaggio mostra quello successivo';
-$labels['indexsort'] = 'Utilizza l\'indice del messaggio per l\'ordinamento per data';
 $labels['mainoptions'] = 'Opzioni principali';
 $labels['section'] = 'Sezione';
 $labels['maintenance'] = 'Manutenzione';
@@ -273,6 +291,8 @@ $labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
 $labels['belowquote'] = 'sotto la citazione';
 $labels['abovequote'] = 'sopra la citazione';
 $labels['insertsignature'] = 'Inserisci firma';
+$labels['previewpanemarkread'] = 'Segna i messagi in anteprima come letti';
+$labels['afternseconds'] = 'dopo $n secondi';
 $labels['folder'] = 'Cartella';
 $labels['folders'] = 'Cartelle';
 $labels['foldername'] = 'Nome cartella';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index c46d7582d..0e05093e9 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -48,6 +48,7 @@ $messages['senttooquickly'] = 'Per favore, attendi $sec secondi prima di inviare
 $messages['errorsavingsent'] = 'C\'è stato un errore nel salvare il messaggio inviato';
 $messages['errorsaving'] = 'Impossibile salvare';
 $messages['errormoving'] = 'Impossibile spostare il messaggio';
+$messages['errorcopying'] = 'Impossibile copiare il messaggio';
 $messages['errordeleting'] = 'Impossibile eliminare il messaggio';
 $messages['errormarking'] = 'Impossibile segnare il messaggio';
 $messages['deletecontactconfirm'] = 'Sei sicuro di voler eliminare i contatti selezionati?';
@@ -87,6 +88,7 @@ $messages['copyerror'] = 'Impossibile copiare gli indirizzi';
 $messages['sourceisreadonly'] = 'La rubrica è in sola lettura';
 $messages['errorsavingcontact'] = 'Impossibile salvare il contatto';
 $messages['movingmessage'] = 'Spostamento del messaggio...';
+$messages['copyingmessage'] = 'Copia del messaggio';
 $messages['receiptsent'] = 'Ricevuta di ritorno inviata con successo';
 $messages['errorsendingreceipt'] = 'Impossibile spedire la ricevuta di ritorno';
 $messages['nodeletelastidentity'] = 'Impossibile eliminare l\'unica identità disponibile';
@@ -94,6 +96,8 @@ $messages['addsubfolderhint'] = 'La cartella verrà creata come sotto cartella d
 $messages['forbiddencharacter'] = 'Il nome della cartella contiene un carattere vietato';
 $messages['selectimportfile'] = 'Per favore, seleziona il file da caricare';
 $messages['addresswriterror'] = 'La rubrica selezionata non è scrivibile';
+$messages['contactaddedtogroup'] = 'Contatto aggiunto con successo al gruppo';
+$messages['contactremovedfromgroup'] = 'Contatto rimosso con successo dal gruppo';
 $messages['importwait'] = 'Importazione in corso, attendere...';
 $messages['importerror'] = 'Importazione fallita! Il file caricato non è un file vCard valido.';
 $messages['importconfirm'] = '<b>Importati con successo $inserted contatti, saltate $skipped voci esistenti</b>:<p><em>$names</em></p>';
@@ -108,5 +112,7 @@ $messages['smtptoerror'] = 'Errore SMTP ($code): Fallito l\'inserimento del dest
 $messages['smtprecipientserror'] = 'Errore SMTP: Impossibile processare la lista dei destinatari';
 $messages['smtperror'] = 'Errore SMTP: $msg';
 $messages['emailformaterror'] = 'Indirizzo e-mail non corretto: $email';
+$messages['toomanyrecipients'] = 'Numero eccessivo di destinatari, ridurlo a $max';
+$messages['maxgroupmembersreached'] = 'Il numero dei membri del gruppo eccede il massimo di $max';
 
 ?>
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 099ada03c..1c57a2b57 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -249,7 +249,7 @@ $labels['signature'] = 'Parašas';
 $labels['dstactive'] = 'Vasaros laikas skiriasi';
 $labels['htmleditor'] = 'Laiškus kurti HTML formatu';
 $labels['htmlsignature'] = 'HTML parašas';
-$labels['previewpane'] = 'Rodyti peržiūros polangį';
+$labels['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
 $labels['logoutclear'] = 'Išvalyti Šiukšlinę atsijungiant';
 $labels['logoutcompact'] = 'Suspausti Gautų laiškų aplanką atsijungiant';
@@ -272,6 +272,7 @@ $labels['autosavedraft'] = 'Automatiškai įrašyti juodraščius';
 $labels['everynminutes'] = 'kas $n min.';
 $labels['keepalive'] = 'Tikrinti ar yra naujų laiškų';
 $labels['never'] = 'niekada';
+$labels['immediately'] = 'nedelsiant';
 $labels['messagesdisplaying'] = 'Laiškų rodymas';
 $labels['messagescomposition'] = 'Laiškų rašymas';
 $labels['mimeparamfolding'] = 'Prisegtų failų vardų kodavimas';
@@ -300,6 +301,8 @@ $labels['replysignaturepos'] = 'Atsakant ir persiunčiant laiškus, parašą pri
 $labels['belowquote'] = 'po citata';
 $labels['abovequote'] = 'virš citatos';
 $labels['insertsignature'] = 'Pridėti parašą';
+$labels['previewpanemarkread'] = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
+$labels['afternseconds'] = 'praėjus $n sek.';
 $labels['folder'] = 'Aplankas';
 $labels['folders'] = 'Aplankai';
 $labels['foldername'] = 'Aplanko vardas';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 3aadcc44b..41dce75d0 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -46,14 +46,14 @@ $labels['organization'] = 'Organisasjon';
 $labels['reply-to'] = 'Svar-til';
 $labels['mailboxlist'] = 'Katalogar';
 $labels['messagesfromto'] = 'Meldingar $from til $to av $count';
+$labels['threadsfromto'] = 'Trådar $from til $to ($count stk)';
 $labels['messagenrof'] = 'Melding $nr av $count';
+$labels['copy'] = 'Kopier';
+$labels['move'] = 'Flytt';
 $labels['moveto'] = 'flytt til...';
 $labels['download'] = 'last ned';
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorleik';
-$labels['preferhtml'] = 'Føretrekk HTML';
-$labels['htmlmessage'] = 'HTML-melding';
-$labels['prettydate'] = 'Pene datoar';
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mån';
@@ -117,10 +117,38 @@ $labels['markread'] = 'Som lese';
 $labels['markunread'] = 'Som ulese';
 $labels['markflagged'] = 'Som flagga';
 $labels['markunflagged'] = 'Som uflagga';
+$labels['messageactions'] = 'Fleire handlingar...';
 $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
+$labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
+$labels['flagged'] = 'Flagga';
+$labels['unanswered'] = 'Ikkje svara';
+$labels['deleted'] = 'Sletta';
+$labels['invert'] = 'Inverter';
+$labels['filter'] = 'Filtrer';
+$labels['list'] = 'List opp';
+$labels['threads'] = 'Trådar';
+$labels['expand-all'] = 'Utvid alle';
+$labels['expand-unread'] = 'Utvid ulesne';
+$labels['collapse-all'] = 'Slå saman alle';
+$labels['threaded'] = 'Tråda';
+$labels['autoexpand_threads'] = 'Utvid eposttråder';
+$labels['do_expand'] = 'alle tråder';
+$labels['expand_only_unread'] = 'berre med ulesne epostar';
+$labels['fromto'] = 'Sendar/Mottakar';
+$labels['flag'] = 'Flagg';
+$labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
+$labels['sentdate'] = 'Sendtdato';
+$labels['arrival'] = 'Mottaksdato';
+$labels['asc'] = 'Alfabetisk';
+$labels['desc'] = 'Motsatt alfabetisk';
+$labels['listcolumns'] = 'Vis kolonner';
+$labels['listsorting'] = 'Sorteringskolonne';
+$labels['listorder'] = 'Sorteringsveg';
+$labels['listmode'] = 'Listevisningmodus';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
 $labels['purge'] = 'Reinska opp';
@@ -129,8 +157,12 @@ $labels['unknown'] = 'ukjend';
 $labels['unlimited'] = 'ubegrensa';
 $labels['quicksearch'] = 'Snøggsøk';
 $labels['resetsearch'] = 'Tilbakestill søk';
+$labels['searchmod'] = 'Søkeutsagn';
+$labels['msgtext'] = 'Heile eposten';
 $labels['openinextwin'] = 'Opna i nytt vindauga';
+$labels['emlsave'] = 'Last ned (.eml)';
 $labels['compose'] = 'Skriv ei melding';
+$labels['editasnew'] = 'Rediger som ny';
 $labels['savemessage'] = 'Lagra kladd';
 $labels['sendmessage'] = 'Send meldinga no';
 $labels['addattachment'] = 'Legg ved ei fil';
@@ -180,10 +212,13 @@ $labels['contactsfromto'] = 'Kontaktar $from til $to av $count';
 $labels['print'] = 'Skriv ut';
 $labels['export'] = 'Eksport';
 $labels['exportvcards'] = 'Eksporter kontaktar i vCard-format';
+$labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
+$labels['groupactions'] = 'Handlingar for kontaktgruppar...';
 $labels['previouspage'] = 'Førre side';
 $labels['firstpage'] = 'Fyrste side';
 $labels['nextpage'] = 'Neste side';
 $labels['lastpage'] = 'Siste side';
+$labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppar';
 $labels['personaladrbook'] = 'Personlege adresser';
 $labels['import'] = 'Importer';
@@ -201,6 +236,10 @@ $labels['manageidentities'] = 'Administrere identitetar for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
 $labels['newitem'] = 'Nytt element';
 $labels['edititem'] = 'Redigere element';
+$labels['preferhtml'] = 'Føretrekk HTML';
+$labels['defaultcharset'] = 'Standard karaktersett (charset)';
+$labels['htmlmessage'] = 'HTML-melding';
+$labels['prettydate'] = 'Pene datoar';
 $labels['setdefault'] = 'Set som standard';
 $labels['autodetect'] = 'Automatisk';
 $labels['language'] = 'Språk';
@@ -223,11 +262,47 @@ $labels['autosend'] = 'send automatisk';
 $labels['ignore'] = 'ignorer';
 $labels['readwhendeleted'] = 'Marker melding som lese ved sletting';
 $labels['flagfordeletion'] = 'Flagg meldinga for sletting i staden for å sletta';
+$labels['skipdeleted'] = 'Ikkje vis sletta epostar';
+$labels['deletealways'] = 'Slett epostar som ikkje kan flyttast til søppelkorga';
+$labels['showremoteimages'] = 'Vis eksterne bilete';
+$labels['fromknownsenders'] = 'frå kjende sendarar';
+$labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilete under meldinga';
 $labels['autosavedraft'] = 'Lagra kladd automatisk';
+$labels['everynminutes'] = 'kvart $n minutt';
+$labels['keepalive'] = 'Sjekk etter ny epost';
 $labels['never'] = 'aldri';
+$labels['immediately'] = 'med ein gong';
 $labels['messagesdisplaying'] = 'Meldingar som viser';
 $labels['messagescomposition'] = 'Meldingar sin komposisjon';
+$labels['mimeparamfolding'] = 'Vedleggsnamn';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Bruk MIME-enkoding for 8-bit characterer (æøå og slik)';
+$labels['advancedoptions'] = 'Avanserte val';
+$labels['focusonnewmessage'] = 'Fokuser nettlesarvindauge på ny epost';
+$labels['checkallfolders'] = 'Sjekk alle mappar for nye epostar';
+$labels['displaynext'] = 'Etter sletting/flytting, vis neste epost';
+$labels['mainoptions'] = 'Hovudinnstillingar';
+$labels['section'] = 'Seksjon';
+$labels['maintenance'] = 'Vedlikehald';
+$labels['newmessage'] = 'Ny epost';
+$labels['listoptions'] = 'Liste-innstillingar';
+$labels['signatureoptions'] = 'Signatur-innstillingar';
+$labels['whenreplying'] = 'Når du svarar';
+$labels['replytopposting'] = 'start ny epost oppante originalen';
+$labels['replybottomposting'] = 'start ny epost nedanfor originalen';
+$labels['replyremovesignature'] = 'Fjern den original signatur frå eposten når du svarar';
+$labels['autoaddsignature'] = 'Legg signatur til automatisk';
+$labels['newmessageonly'] = 'berre på nye epostar';
+$labels['replyandforwardonly'] = 'berre på svar og vidaresending';
+$labels['replysignaturepos'] = 'Når du svarar eller sender vidare, plasser signaturen';
+$labels['belowquote'] = 'nedanfor siteringa';
+$labels['abovequote'] = 'oppanfor siteringa';
+$labels['insertsignature'] = 'Sett inn signatur';
+$labels['previewpanemarkread'] = 'Merk forehandsviste epostar som leste';
+$labels['afternseconds'] = 'etter $n sekund';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenamn';
@@ -243,5 +318,27 @@ $labels['specialfolders'] = 'Spesialmapper';
 $labels['sortby'] = 'Sorter etter';
 $labels['sortasc'] = 'Sorter stigande';
 $labels['sortdesc'] = 'Sorter søkkjande';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+$labels['unicode'] = 'UNicode';
+$labels['english'] = 'Engelsk';
+$labels['westerneuropean'] = 'Vest-europesik';
+$labels['easterneuropean'] = 'Aust-europesik';
+$labels['southeasterneuropean'] = 'Sør-aust-europeisk';
+$labels['baltic'] = 'Baltisk';
+$labels['cyrillic'] = 'Kyrilisk';
+$labels['arabic'] = 'Arabisk';
+$labels['greek'] = 'Gresk';
+$labels['hebrew'] = 'Hebraisk';
+$labels['turkish'] = 'Tyrkisk';
+$labels['nordic'] = 'Nordisk';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Keltisk';
+$labels['vietnamese'] = 'Vietnamesisk';
+$labels['japanese'] = 'Japansk';
+$labels['korean'] = 'Koreansk';
+$labels['chinese'] = 'Kinesisk';
 
 ?>
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 3a8a7d81f..60c89c883 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -23,10 +23,13 @@ $messages['loginfailed'] = 'Feil ved innlogging';
 $messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies)';
 $messages['sessionerror'] = 'Sesjonen din er ulovleg eller har gått ut på tid';
 $messages['imaperror'] = 'Feil ved tilkopling til IMAP-tenar';
+$messages['servererror'] = 'Tenarfeil!';
+$messages['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa';
 $messages['loggedout'] = 'Du har avslutta sesjonen. Ha det bra!';
 $messages['mailboxempty'] = 'Postkassa er tom';
 $messages['loading'] = 'Lastar...';
+$messages['uploading'] = 'Lastar opp fil...';
 $messages['loadingdata'] = 'Lastar inn data...';
 $messages['checkingmail'] = 'Ser etter nye meldingar...';
 $messages['sendingmessage'] = 'Sender melding...';
@@ -45,15 +48,22 @@ $messages['senttooquickly'] = 'Du må venta $sec sekund for å senda meldinga';
 $messages['errorsavingsent'] = 'Klarte ikkje lagra den sende meldinga';
 $messages['errorsaving'] = 'Det skjedde ein feil ved lagring';
 $messages['errormoving'] = 'Kunne ikkje flytte meldinga';
+$messages['errorcopying'] = 'Kan ikkje kopiera epost';
 $messages['errordeleting'] = 'Kunne ikkje slette meldinga';
+$messages['errormarking'] = 'Kan ikkje markera epost';
 $messages['deletecontactconfirm'] = 'Sletta kontakt(ar)?';
 $messages['deletemessagesconfirm'] = 'Sletta melding(ar)?';
 $messages['deletefolderconfirm'] = 'Sletta mappa?';
 $messages['purgefolderconfirm'] = 'Sletta alle meldingane i denne mappa?';
+$messages['foldercreating'] = 'Lagar mappe...';
+$messages['folderdeleting'] = 'Slettar mappe...';
+$messages['folderrenaming'] = 'Endrar namn på mappe...';
+$messages['foldermoving'] = 'Flyttar mappe...';
 $messages['formincomplete'] = 'Fyll ut skjema';
 $messages['noemailwarning'] = 'Skriv inn korrekt epostadresse';
 $messages['nonamewarning'] = 'Skriv inn namn';
 $messages['nopagesizewarning'] = 'Skriv inn sidestorleik';
+$messages['nosenderwarning'] = 'Skriv inn avsendar si e-postadresse';
 $messages['norecipientwarning'] = 'Skriv inn minst ein mottakar';
 $messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skriva inn eitt emne no?';
 $messages['nobodywarning'] = 'Senda melding utan tekst?';
@@ -61,6 +71,7 @@ $messages['notsentwarning'] = 'Meldinga er ikkje sendt. Vil du kasta ho?';
 $messages['noldapserver'] = 'Vel LDAP-tenar å søkja i';
 $messages['nocontactsreturned'] = 'Fann ingen kontaktar';
 $messages['nosearchname'] = 'Skriv inn kontaktnamn eller epostadressa';
+$messages['notuploadedwarning'] = 'Ikkje alle vedlegga er lasta opp. Vent eller avslutt opplastinga.';
 $messages['searchsuccessful'] = 'Fann $nr meldingar';
 $messages['searchnomatch'] = 'Søket fann ingenting';
 $messages['searching'] = 'Søkjer...';
@@ -77,6 +88,7 @@ $messages['copyerror'] = 'Kunne ikkje kopiera adresser';
 $messages['sourceisreadonly'] = 'Denne adressekjelda er berre lesbar';
 $messages['errorsavingcontact'] = 'Kunne ikkje lagra kontaktadressa';
 $messages['movingmessage'] = 'Flyttar melding...';
+$messages['copyingmessage'] = 'Kopierer epost...';
 $messages['receiptsent'] = 'Sende melding-er-lest-kvittering';
 $messages['errorsendingreceipt'] = 'Kunne ikkje senda melding-er-lest-kvittering';
 $messages['nodeletelastidentity'] = 'Du kan ikkje sletta denne identiteten, det er den siste.';
@@ -84,9 +96,23 @@ $messages['addsubfolderhint'] = 'Denne mappa vert laga som ei undermappe til den
 $messages['forbiddencharacter'] = 'Mappenamn inneheld eit teikn som ikkje er støtta';
 $messages['selectimportfile'] = 'Vel ei fil til å lasta opp';
 $messages['addresswriterror'] = 'Denne adresseboka er ikkje skrivbar';
+$messages['contactaddedtogroup'] = 'La til kontaktane til denne gruppa';
+$messages['contactremovedfromgroup'] = 'Tok vekk kontaktane frå denne gruppa';
 $messages['importwait'] = 'Importerer, vent...';
 $messages['importerror'] = 'Importering feila! Fila er ikkje ei korrekt vCard-file.';
 $messages['importconfirm'] = '<b>Importerte $inserted kontakar, hoppa over $skipped oppføringar</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'Ulovleg operasjon.';
+$messages['nofromaddress'] = 'Manglar epostadresse i denne identiteten';
+$messages['editorwarning'] = 'Du mistar all formatering når du bytar til rein tekst. Er det greit?';
+$messages['httpreceivedencrypterror'] = 'Noko er totalt feilkonfigurert, send ein sint epost til administrator. No. <b>Meldinga di kunne ikkje bli sendt.</b>';
+$messages['smtpconnerror'] = 'SMTP-feil ($code): Tilkopling til tenar feila';
+$messages['smtpautherror'] = 'SMTP-feil ($code): Autentisering feila';
+$messages['smtpfromerror'] = 'SMTP-feil ($code): Feila å setja sendar «$from»';
+$messages['smtptoerror'] = 'SMTP-feil ($code): Feila å leggja til mottakar «$to»';
+$messages['smtprecipientserror'] = 'SMTP-feil: Eg forstår ikkje mottakarlista (sjå over han...)';
+$messages['smtperror'] = 'SMTP-feil: $msg';
+$messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
+$messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til maksimalt $max.';
+$messages['maxgroupmembersreached'] = 'Du kan berre ha $max grupper, du er over grensa søta.';
 
 ?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 58606d350..db9795b9a 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -216,10 +216,13 @@ $labels['contactsfromto'] = 'Contatos $from - $to de $count';
 $labels['print'] = 'Imprimir';
 $labels['export'] = 'Exportar';
 $labels['exportvcards'] = 'Exportar os contatos em formato vCard';
+$labels['newcontactgroup'] = 'Criar novo grupo de contatos';
+$labels['groupactions'] = 'Ações para grupos de contatos...';
 $labels['previouspage'] = 'Página Anterior';
 $labels['firstpage'] = 'Primeira Página ';
 $labels['nextpage'] = 'Próxima Página';
 $labels['lastpage'] = 'Última Página';
+$labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Endereços pessoais';
 $labels['import'] = 'Importar';
@@ -273,6 +276,7 @@ $labels['autosavedraft'] = 'Salvar rascunho automaticamente';
 $labels['everynminutes'] = 'a cada $n minuto(s)';
 $labels['keepalive'] = 'Verificar se há novas mensagens';
 $labels['never'] = 'nunca';
+$labels['immediately'] = 'imediatamente';
 $labels['messagesdisplaying'] = 'Exibição de mensagens';
 $labels['messagescomposition'] = 'Composição de mensagens';
 $labels['mimeparamfolding'] = 'Nomes de anexos';
@@ -301,6 +305,8 @@ $labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
 $labels['belowquote'] = 'abaixo da citação';
 $labels['abovequote'] = 'acima da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
+$labels['previewpanemarkread'] = 'Marcar mensagem pré-visualizada como lida';
+$labels['afternseconds'] = 'depois de $n segundos';
 $labels['folder'] = 'Pasta';
 $labels['folders'] = 'Pastas';
 $labels['foldername'] = 'Nome da pasta';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index f6e61ad2c..268240364 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -100,6 +100,8 @@ $messages['addsubfolderhint'] = 'Esta pasta será criada como uma sub-pasta da q
 $messages['forbiddencharacter'] = 'O nome da pasta contém um caractere não permitido';
 $messages['selectimportfile'] = 'Selecione o arquivo para envio';
 $messages['addresswriterror'] = 'O catálogo de endereços selecionado não tem permissão de modificação';
+$messages['contactaddedtogroup'] = 'Adicionado os contatos a este grupo com sucesso';
+$messages['contactremovedfromgroup'] = 'Removido contatos deste grupo com sucesso';
 $messages['importwait'] = 'Importando, aguarde por favor...';
 $messages['importerror'] = 'Falha na importação! O arquivo enviado não é um arquivo vCard válido.';
 $messages['importconfirm'] = '<b>Foram importados com sucesso $inserted contatos, e $skipped contatos foram ignorados</b>:<p><em>$names</em></p>';
@@ -114,5 +116,7 @@ $messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinatári
 $messages['smtprecipientserror'] = 'Erro SMTP: Não é possível analisar a lista destinatários';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endereço de Email incorreto: $email';
+$messages['toomanyrecipients'] = 'Muitos destinatários. Reduza o número de destinatários para $max.';
+$messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max';
 
 ?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 94c2bdb39..69bc9a6b9 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -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'] = 'Пн';
@@ -120,12 +120,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'] = 'Очистить';
@@ -189,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'] = 'Импортировать';
@@ -210,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'] = 'Язык';
@@ -233,6 +262,7 @@ $labels['ignore'] = 'игнорировать';
 $labels['readwhendeleted'] = 'Помечать как прочитанное при удалении';
 $labels['flagfordeletion'] = 'Помечать для удаления вместо удаления';
 $labels['skipdeleted'] = 'Не показывать удаленные сообщения';
+$labels['deletealways'] = 'Удалять сообщения, если не получается поместить их в корзину';
 $labels['showremoteimages'] = 'Показывать удаленные изображения';
 $labels['fromknownsenders'] = 'от известных отправителей';
 $labels['always'] = 'всегда';
@@ -241,12 +271,14 @@ $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 для 8-битных символов';
 $labels['advancedoptions'] = 'Дополнительные настройки';
 $labels['focusonnewmessage'] = 'Фокусировать окно браузера при новом сообщении';
 $labels['checkallfolders'] = 'Проверять новые сообщения во всех папках';
@@ -268,6 +300,8 @@ $labels['replysignaturepos'] = 'Прикрепить подпись при от�
 $labels['belowquote'] = 'после цитаты';
 $labels['abovequote'] = 'до цитаты';
 $labels['insertsignature'] = 'Вставить подпись';
+$labels['previewpanemarkread'] = 'Отмечать просмотренные сообщения как прочитанные';
+$labels['afternseconds'] = 'через $n секунд';
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Имя папки';
@@ -287,5 +321,6 @@ $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+$labels['cyrillic'] = 'Кириллица';
 
 ?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index e4e223121..aeee80160 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -47,6 +47,7 @@ $messages['senttooquickly'] = 'Вы должны подождать $sec сек.
 $messages['errorsavingsent'] = 'Произошла ошибка при сохранении отправленного сообщения';
 $messages['errorsaving'] = 'В процессе сохранения произошла ошибка';
 $messages['errormoving'] = 'Не удалось переместить сообщение';
+$messages['errorcopying'] = 'Не удалось скопировать сообщение';
 $messages['errordeleting'] = 'Не удалось удалить сообщение';
 $messages['errormarking'] = 'Невозможно пометить сообщение';
 $messages['deletecontactconfirm'] = 'Вы действительно хотите удалить выделенные контакты?';
@@ -86,6 +87,7 @@ $messages['copyerror'] = 'Невозможно скопировать адрес
 $messages['sourceisreadonly'] = 'Данный источник адресов только для чтения';
 $messages['errorsavingcontact'] = 'Невозможно сохранить адрес контакта';
 $messages['movingmessage'] = 'Перемещение сообщения…';
+$messages['copyingmessage'] = 'Копирование сообщения...';
 $messages['receiptsent'] = 'Уведомление о прочтении отправлено';
 $messages['errorsendingreceipt'] = 'Уведомление о прочтении не отправлено';
 $messages['nodeletelastidentity'] = 'Вы не можете удалить этот профиль, он у вас последний';
@@ -93,6 +95,8 @@ $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>';
@@ -107,5 +111,7 @@ $messages['smtptoerror'] = 'SMTP Error ($code): Невозможно добав�
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Невозможно обработать список получателей';
 $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Неверный адрес: $email';
+$messages['toomanyrecipients'] = 'Слишком много получателей, уменьшите их количество до $max.';
+$messages['maxgroupmembersreached'] = 'Размер группы больше максимально разрешенного - $max';
 
 ?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 5cb80a8ea..bae628664 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -1,4 +1,3 @@
-<!-- Update from SVN: sl_SI/labels.inc-->
 <?php
 
 /*
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 958252150..c8d2b5555 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -122,6 +122,7 @@ $labels['messageactions'] = 'Hanteringsalternativ';
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
+$labels['currpage'] = 'Aktuell sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
@@ -212,10 +213,13 @@ $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['group'] = 'Grupp';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Personliga adresser';
 $labels['import'] = 'Importera';
@@ -269,6 +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['messagesdisplaying'] = 'Visning av meddelanden';
 $labels['messagescomposition'] = 'Redigering av meddelanden';
 $labels['mimeparamfolding'] = 'Kodning av namn på bifogade filer';
@@ -297,6 +302,8 @@ $labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
 $labels['belowquote'] = 'nedanför befintligt meddelande';
 $labels['abovequote'] = 'ovanför befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
+$labels['previewpanemarkread'] = 'Märk förhandsgranskat meddelande som läst';
+$labels['afternseconds'] = 'efter $n sekunder';
 $labels['folder'] = 'Katalog';
 $labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index f8e22ae4a..a67c33539 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -49,6 +49,7 @@ $messages['senttooquickly'] = 'Vänta ytterligare $sec sekunder med att skicka m
 $messages['errorsavingsent'] = 'Ett fel inträffade när det skickade meddelandet sparades';
 $messages['errorsaving'] = 'Meddelandet kunde inte sparads';
 $messages['errormoving'] = 'Meddelandet kunde inte flyttas';
+$messages['errorcopying'] = 'Kunde inte kopiera meddelande(n)';
 $messages['errordeleting'] = 'Meddelandet kunde inte raderas';
 $messages['errormarking'] = 'Meddelandet kunde inte markeras';
 $messages['deletecontactconfirm'] = 'Vill du verkligen radera valda kontakter?';
@@ -96,6 +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['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>';
@@ -110,5 +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';
 
 ?>