Improved folder display; added Portuguese and Catalan translation

12 files changed, 739 insertions, 70 deletions

diff --git a/program/localization/ca/labels.inc b/program/localization/ca/labels.inc
new file mode 100644
index 000000000..533cd318d
--- /dev/null
+++ b/program/localization/ca/labels.inc
@@ -0,0 +1,175 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/ca/labels.inc                                                |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page
+$labels['username']  = 'Nom d\'usuari';
+$labels['password']  = 'Password';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Sortir';
+$labels['mail']     = 'E-Mail';
+$labels['settings'] = 'Configuració Personal';
+$labels['addressbook'] = 'Llibreta d\'adreces';
+
+// mailbox names
+$labels['inbox']  = 'Entrada';
+$labels['sent']   = 'Enviats';
+$labels['trash']  = 'Paperera';
+$labels['drafts'] = 'Esborranys';
+$labels['junk']   = 'Junk';
+
+// message listing
+$labels['subject'] = 'Assumpte';
+$labels['from']    = 'Remitent';
+$labels['to']      = 'Destinatari';
+$labels['cc']      = 'Còpia';
+$labels['bcc']     = 'Còpia Oculta';
+$labels['replyto'] = 'Respondre a';
+$labels['date']    = 'Data';
+$labels['size']    = 'Mida';
+$labels['priority'] = 'Prioritat';
+$labels['organization'] = 'Organització';
+
+// aliases
+$labels['reply-to'] = $labels['replyto'];
+
+$labels['mailboxlist'] = 'Carpetes';
+$labels['messagesfromto'] = 'Missatges de $from a $to de $count';
+$labels['messagenrof'] = 'Missatge $nr de $count';
+
+$labels['moveto']   = 'moure a...';
+$labels['download'] = 'descarregar';
+
+$labels['filename'] = 'Nom del fitxer';
+$labels['filesize'] = 'Mida del fitxer';
+
+$labels['preferhtml'] = 'Prefereix HTML';
+$labels['htmlmessage'] = 'Missatge HTML';
+
+$labels['addtoaddressbook'] = 'Afegir a la llibreta d\'adreces';
+
+// weekdays short
+$labels['sun'] = 'Dg';
+$labels['mon'] = 'Dl';
+$labels['tue'] = 'Dm';
+$labels['wed'] = 'Dc';
+$labels['thu'] = 'Dj';
+$labels['fri'] = 'Dv';
+$labels['sat'] = 'Ds';
+
+// weekdays long
+$labels['sunday']    = 'Diumenge';
+$labels['monday']    = 'Dillunes';
+$labels['tuesday']   = 'Dimarts';
+$labels['wednesday'] = 'Dimecres';
+$labels['thursday']  = 'Dijous';
+$labels['friday']    = 'Divendres';
+$labels['saturday']  = 'Dissabte';
+
+$labels['today'] = 'Avui';
+
+// toolbar buttons
+$labels['writenewmessage']  = 'Crear nou missatge';
+$labels['replytomessage']   = 'Respondre el missatge';
+$labels['forwardmessage']   = 'Reenviar el missatge';
+$labels['deletemessage']    = 'Moure el missatge a la paperera';
+$labels['printmessage']     = 'Imprimir aquest missatge';
+$labels['previousmessages'] = 'Mostrar els missatges previs';
+$labels['nextmessages']     = 'Mostrar els missatges posteriors';
+$labels['backtolist']       = 'Tornar al llistat de missatges';
+$labels['viewsource']       = 'Capçalera';
+
+$labels['select'] = 'Selecciona';
+$labels['all'] = 'Tots';
+$labels['none'] = 'Cap';
+$labels['unread'] = 'Sense llegir';
+
+// message compose
+$labels['compose']  = 'Escriure un missatge';
+$labels['sendmessage']  = 'Enviar el missatge ara';
+$labels['addattachment']  = 'Afegir un fitxer';
+
+$labels['attachments'] = 'Fitxers afegits';
+$labels['upload'] = 'Pujar-lo';
+$labels['close']  = 'Tancar';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'La més baxia';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
+$labels['highest'] = 'La més alta';
+
+$labels['showimages'] = 'Mostrar imatges';
+
+
+// address boook
+$labels['name']      = 'Mostrar el nom';
+$labels['firstname'] = 'Nom';
+$labels['surname']   = 'Cognom';
+$labels['email']     = 'E-Mail';
+
+$labels['addcontact'] = 'Afegir contacte';
+$labels['editcontact'] = 'Editar contacte';
+
+$labels['edit']   = 'Editar';
+$labels['cancel'] = 'Cancel.lar';
+$labels['save']   = 'Guardar';
+$labels['delete'] = 'Esborrar';
+
+$labels['newcontact']     = 'Crear una nova targeta de contacte';
+$labels['deletecontact']  = 'Esborrar els contactes seleccionats';
+$labels['composeto']      = 'Escriure e-mail per';
+$labels['contactsfromto'] = 'Contactes de  $from a $to de $count';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+
+
+// settings
+$labels['settingsfor']  = 'Opcions per';
+
+$labels['preferences']  = 'Preferències';
+$labels['userpreferences']  = 'Preferències d\'usuari';
+$labels['editpreferences']  = 'Editar preferències d\'usuari';
+
+$labels['identities']  = 'Identitats';
+$labels['manageidentities']  = 'Gestionar identitats del compte';
+$labels['newidentity']  = 'Nova identitat';
+
+$labels['newitem']  = 'Nou item';
+$labels['edititem']  = 'Editar item';
+
+$labels['setdefault']  = 'Triar per defecte';
+$labels['language']  = 'Llengua';
+$labels['timezone']  = 'Zona horària';
+$labels['pagesize']  = 'Fileres per pàgina';
+
+
+$labels['folders']  = 'Carpetes';
+$labels['foldername']  = 'Nom de la carpeta';
+$labels['subscribed']  = 'Suscrita';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear nova carpeta';
+$labels['deletefolder']  = 'Esborrar carpeta';
+$labels['managefolders']  = 'Gestionar carpetes';
+
+
+?>
\ No newline at end of file
diff --git a/program/localization/ca/messages.inc b/program/localization/ca/messages.inc
new file mode 100644
index 000000000..8be981139
--- /dev/null
+++ b/program/localization/ca/messages.inc
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/ca/messages.inc                                              |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Accés Erroni';
+
+$messages['cookiesdisabled'] = 'El teu navegador no accepta cookies';
+
+$messages['sessionerror'] = 'La teva sessió és invàlida o ha caducat';
+
+$messages['imaperror'] = 'La conexió al servidor IMAP ha fallat';
+
+$messages['nomessagesfound'] = 'No hi ha missatges a aquesta bústia';
+
+$messages['loggedout'] = 'Has finalitzat la sessió correctament. Adèu!';
+
+$messages['mailboxempty'] = 'La bústia és buida';
+
+$messages['loadingdata'] = 'Carregant dades...';
+
+$messages['messagesent'] = 'Misstage enviat correctament';
+
+$messages['successfullysaved'] = 'Guardat correctament';
+
+$messages['addedsuccessfully'] = 'Contacte afegit correctament a la llibreta d´adreces';
+
+$messages['contactexists'] = 'Ja existeix un contacte amb aquest e-mail';
+
+$messages['blockedimages'] = 'Per protegir la teva privacitat les imatges remotes han estat bloquejades.';
+
+$messages['encryptedmessage'] = 'És un missatge encriptat i no es pot mostrar. Ho sento!';
+
+$messages['nocontactsfound'] = 'No hi ha contactes';
+
+$messages['sendingfailed'] = 'Error enviant missatge';
+
+$messages['errorsaving'] = 'Error mentre es guardava';
+
+
+?>
\ No newline at end of file
diff --git a/program/localization/en/labels.inc b/program/localization/en/labels.inc
index 97d455c74..bf92bcd15 100644
--- a/program/localization/en/labels.inc
+++ b/program/localization/en/labels.inc
@@ -97,6 +97,7 @@ $labels['printmessage']     = 'Print this message';
 $labels['previousmessages'] = 'Show previous set of messages';
 $labels['nextmessages']     = 'Show next set of messages';
 $labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
 
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
@@ -139,6 +140,8 @@ $labels['newcontact']     = 'Create new contact card';
 $labels['deletecontact']  = 'Delete selected contacts';
 $labels['composeto']      = 'Compose mail to';
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
 
 
 // settings
diff --git a/program/localization/pt/labels.inc b/program/localization/pt/labels.inc
new file mode 100644
index 000000000..30710ba39
--- /dev/null
+++ b/program/localization/pt/labels.inc
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pt/labels.inc                                                |
+ |                                                                       |
+ | Portuguese for Portugal Language file of the RoundCube Webmail client |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Alexandro Pestana (DJ_Alex), Portugal <wpcd@hotmail.com>      |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page
+$labels['username']  = 'Endereço de E-Mail';
+$labels['password']  = 'Password';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Login';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'E-Mail';
+$labels['settings'] = 'Definições Pessoais';
+$labels['addressbook'] = 'Livro de Endereços';
+
+// mailbox names
+$labels['inbox']  = 'Recebidas';
+$labels['sent']   = 'Enviadas';
+$labels['trash']  = 'Reciclagem';
+$labels['drafts'] = 'Rascunhos';
+$labels['junk']   = 'SPAM';
+
+// message listing
+$labels['subject'] = 'Assunto';
+$labels['from']    = 'De';
+$labels['to']      = 'Para';
+$labels['cc']      = 'Cópia';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Responder-a';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
+$labels['priority'] = 'Prioridade';
+$labels['organization'] = 'Organização';
+
+// aliases
+$labels['reply-to'] = $labels['replyto'];
+
+$labels['mailboxlist'] = 'Pastas';
+$labels['messagesfromto'] = 'Mensagens $from ate $to de $count';
+$labels['messagenrof'] = 'Mensagem $nr of $count';
+
+$labels['moveto']   = 'mover para...';
+$labels['download'] = 'descarregar';
+
+$labels['filename'] = 'Nome do ficheiro';
+$labels['filesize'] = 'Tamanho do ficheiro';
+
+$labels['preferhtml'] = 'Prefiro HTML';
+$labels['htmlmessage'] = 'Mensagem HTML';
+$labels['prettydate'] = ' Datas bonitas';
+
+$labels['addtoaddressbook'] = 'Adicionar ao livro de endereços';
+
+// weekdays short
+$labels['sun'] = 'Dom';
+$labels['mon'] = 'Seg';
+$labels['tue'] = 'Ter';
+$labels['wed'] = 'Qua';
+$labels['thu'] = 'Qui';
+$labels['fri'] = 'Sex';
+$labels['sat'] = 'Sab';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda';
+$labels['tuesday']   = 'Terça';
+$labels['wednesday'] = 'Quarta';
+$labels['thursday']  = 'Quinta';
+$labels['friday']    = 'Sexta';
+$labels['saturday']  = 'Sábado';
+
+$labels['today'] = 'Hoje';
+
+// toolbar buttons
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['replytomessage']   = 'Responder a mensagem';
+$labels['forwardmessage']   = 'Reencaminhar a mensagem';
+$labels['deletemessage']    = 'Mover a mensagem para a reciclagem';
+$labels['printmessage']     = 'Imprimir esta mensagem';
+$labels['previousmessages'] = 'Mostrar grupo de mensagens anterior';
+$labels['nextmessages']     = 'Mostrar grupo de mensagens seguinte';
+$labels['backtolist']       = 'Voltar à lista de mensagens';
+
+$labels['select'] = 'Seleccionar';
+$labels['all'] = 'Todas';
+$labels['none'] = 'Nenhuma';
+$labels['unread'] = 'Não lidas';
+
+// message compose
+$labels['compose']  = 'Escrever uma mensagem';
+$labels['sendmessage']  = 'Enviar a mensagem agora';
+$labels['addattachment']  = 'Anexar um ficheiro';
+
+$labels['attachments'] = 'Anexos';
+$labels['upload'] = 'Carregar';
+$labels['close']  = 'Fechar';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Mais baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
+$labels['highest'] = 'Mais alta';
+
+$labels['showimages'] = 'Mostrar imagens';
+
+
+// address boook
+$labels['name']      = 'Mostrar nome';
+$labels['firstname'] = 'Primeiro nome';
+$labels['surname']   = 'Último nome';
+$labels['email']     = 'E-Mail';
+
+$labels['addcontact'] = 'Adicionar novo contacto';
+$labels['editcontact'] = 'Editar contacto';
+
+$labels['edit']   = 'Editar';
+$labels['cancel'] = 'Cancelar';
+$labels['save']   = 'Gravar';
+$labels['delete'] = 'Apagar';
+
+$labels['newcontact']     = 'Criar novo cartão de contacto';
+$labels['deletecontact']  = 'Apagar contactos seleccionados';
+$labels['composeto']      = 'Escrever email para';
+$labels['contactsfromto'] = 'Contactos $from até $to de $count';
+
+
+// settings
+$labels['settingsfor']  = 'Definições para';
+
+$labels['preferences']  = 'Preferências';
+$labels['userpreferences']  = 'Preferências do utilizador';
+$labels['editpreferences']  = 'Editar preferências do utilizador';
+
+$labels['identities']  = 'Identidades';
+$labels['manageidentities']  = 'Gerir identidades para esta conta';
+$labels['newidentity']  = 'Nova identidade';
+
+$labels['newitem']  = 'Novo item';
+$labels['edititem']  = 'Editar item';
+
+$labels['setdefault']  = 'Definir como default';
+$labels['language']  = 'Língua';
+$labels['timezone']  = 'Zona horária';
+$labels['pagesize']  = 'Linhas por página';
+
+
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Subscrito';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['deletefolder']  = 'Remover pasta';
+$labels['managefolders']  = 'Gerir pastas';
+
+
+?>
+
diff --git a/program/localization/pt/messages.inc b/program/localization/pt/messages.inc
new file mode 100644
index 000000000..4276365eb
--- /dev/null
+++ b/program/localization/pt/messages.inc
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pt/messages.inc                                              |
+ |                                                                       |
+ | Portuguese for Portugal Language file of the RoundCube Webmail client |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Alexandro Pestana (DJ_Alex), Portugal <wpcd@hotmail.com>      |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Autenticação falhou';
+
+$messages['cookiesdisabled'] = 'O seu browser não aceita cookies';
+
+$messages['sessionerror'] = 'A sua sessão é inválida ou expirou';
+
+$messages['imaperror'] = 'Ligação ao servidor IMAP falhou';
+
+$messages['nomessagesfound'] = 'Não foram encontradas mensagens nesta caixa de correio';
+
+$messages['loggedout'] = 'Você terminou a sessão com sucesso. Adeus!';
+
+$messages['mailboxempty'] = 'A caixa de correio está vazia';
+
+$messages['loadingdata'] = 'Carregando dados...';
+
+$messages['messagesent'] = 'Mensagem enviada com sucesso';
+
+$messages['successfullysaved'] = 'Gravado com sucesso';
+
+$messages['addedsuccessfully'] = 'Contacto adicionado ao livro de endereços com sucesso';
+
+$messages['contactexists'] = 'Já existe um contacto com este endereço de e-mail';
+
+$messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens remotas estão bloqueadas nesta mensagem.';
+
+$messages['encryptedmessage'] = 'Esta é uma mensagem encriptada e não pode ser mostrada. Desculpe!';
+
+$messages['nocontactsfound'] = 'Não foram encontrados contactos';
+
+$messages['sendingfailed'] = 'A mensagem não foi enviada';
+
+$messages['errorsaving'] = 'Ocorreu um erro no decorrer da gravação';
+
+
+?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
new file mode 100644
index 000000000..00867462c
--- /dev/null
+++ b/program/localization/pt_BR/labels.inc
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pt_BR/labels.inc                                             |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+ | Portuguese translation: Anderson Ferreira <anderson@cnpm.embrapa.br>  |
+ +-----------------------------------------------------------------------+
+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page
+$labels['username']  = 'Usu&aacute;rio';
+$labels['password']  = 'Senha';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Login';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'E-Mail';
+$labels['settings'] = 'Configura&cedil;&otilde;es pessoais';
+$labels['addressbook'] = 'Cat&aacute;logo de endere&cedil;os';
+
+// mailbox names
+$labels['inbox']  = 'Caixa de entrada';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Lixeira';
+$labels['drafts'] = 'Rascunhos';
+$labels['junk']   = 'Spam';
+
+// message listing
+$labels['subject'] = 'Assunto';
+$labels['from']    = 'De';
+$labels['to']      = 'Para';
+$labels['cc']      = 'C&oacute;pia';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Responder para';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
+$labels['priority'] = 'Prioridade';
+$labels['organization'] = 'Organiza&cedil;&atilde;o';
+
+// aliases
+$labels['reply-to'] = $labels['replyto'];
+
+$labels['mailboxlist'] = 'Mensagens';
+$labels['messagesfromto'] = 'Mensagens $from at&eacute; $to de $count';
+$labels['messagenrof'] = 'Mensagens $nr de $count';
+
+$labels['moveto']   = 'mover para ...';
+$labels['download'] = 'download';
+
+$labels['filename'] = 'Nome do arquivo';
+$labels['filesize'] = 'Tamanho do arquivo';
+
+$labels['preferhtml'] = 'Prefere HTML';
+$labels['htmlmessage'] = 'Mensagem HTML';
+$labels['prettydate'] = 'Formatar datas';
+
+$labels['addtoaddressbook'] = 'Incluir no cat&aacute;logo de endere&cedil;os';
+
+// weekdays short
+$labels['sun'] = 'Dom';
+$labels['mon'] = 'Seg';
+$labels['tue'] = 'Ter';
+$labels['wed'] = 'Qua';
+$labels['thu'] = 'Qui';
+$labels['fri'] = 'Sex';
+$labels['sat'] = 'Sáb';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda';
+$labels['tuesday']   = 'Ter&cedil;a';
+$labels['wednesday'] = 'Quarta';
+$labels['thursday']  = 'Quinta';
+$labels['friday']    = 'Sexta';
+$labels['saturday']  = 'S&aacute;bado';
+
+$labels['today'] = 'Hoje';
+
+// toolbar buttons
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['replytomessage']   = 'Responder';
+$labels['forwardmessage']   = 'Encaminhar';
+$labels['deletemessage']    = 'Mover para a lixeira';
+$labels['printmessage']     = 'Imprimir';
+$labels['previousmessages'] = 'Anterior';
+$labels['nextmessages']     = 'Pr&oacute;ximo';
+$labels['backtolist']       = 'Voltar';
+
+$labels['select'] = 'Selecionar';
+$labels['all'] = 'Todos';
+$labels['none'] = 'Nenhum';
+$labels['unread'] = 'Não lido';
+
+// message compose
+$labels['compose']  = 'Compor nova mensagem';
+$labels['sendmessage']  = 'Enviar mensagem agora';
+$labels['addattachment']  = 'Anexar arquivo';
+
+$labels['attachments'] = 'Anexos';
+$labels['upload'] = 'Enviar';
+$labels['close']  = 'Fechar';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Mais baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
+$labels['highest'] = 'Urgente';
+
+$labels['showimages'] = 'Exibir imagens';
+
+
+// address boook
+$labels['name']      = 'Nome';
+$labels['firstname'] = 'Primeiro nome';
+$labels['surname']   = 'Sobrenome';
+$labels['email']     = 'E-Mail';
+
+$labels['addcontact'] = 'Incluir novo contato';
+$labels['editcontact'] = 'Editar contato';
+
+$labels['edit']   = 'Editar';
+$labels['cancel'] = 'Cancelar';
+$labels['save']   = 'Salvar';
+$labels['delete'] = 'Excluir';
+
+$labels['newcontact']     = 'Criar novo contato';
+$labels['deletecontact']  = 'Excluir contatos selecionados';
+$labels['composeto']      = 'Compor email para ';
+$labels['contactsfromto'] = 'Contatos $from até $to de $count';
+
+
+// settings
+$labels['settingsfor']  = 'Configurações para';
+
+$labels['preferences']  = 'Preferência';
+$labels['userpreferences']  = 'Preferências do usuário';
+$labels['editpreferences']  = 'Editar preferências do usuário';
+
+$labels['identities']  = 'Identidade';
+$labels['manageidentities']  = 'Gerenciar identidades para essa conta';
+$labels['newidentity']  = 'Nova identidade';
+
+$labels['newitem']  = 'Novo item';
+$labels['edititem']  = 'Editar item';
+
+$labels['setdefault']  = 'Padrão';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Linhas por página';
+
+
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nova pasta';
+$labels['subscribed']  = 'Assinadas';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['deletefolder']  = 'Excluir pasta';
+$labels['managefolders']  = 'Gerenciar pastas';
+
+
+?>
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
new file mode 100644
index 000000000..f96a0a862
--- /dev/null
+++ b/program/localization/pt_BR/messages.inc
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pt_BR/messages.inc                                           |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+ | Portuguese translation: Anderson Ferreira <anderson@cnpm.embrapa.br>  |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Falha no login';
+
+$messages['cookiesdisabled'] = 'Seu navegador não suporta cookies';
+
+$messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
+
+$messages['imaperror'] = 'Conexão com o servidor IMAP falhou';
+
+$messages['nomessagesfound'] = 'Nenhuma mensagem foi encontrada na caixa postal';
+
+$messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até breve!';
+
+$messages['mailboxempty'] = 'A caixa postal está vazia';
+
+$messages['loadingdata'] = 'Carregando informações...';
+
+$messages['messagesent'] = 'Mensagem enviada';
+
+$messages['successfullysaved'] = 'Salvo com sucesso';
+
+$messages['addedsuccessfully'] = 'Contato incluido com sucesso';
+
+$messages['contactexists'] = 'Um contato com esse e-mail já existe';
+
+$messages['blockedimages'] = 'Para proteger sua privacidade, as imagens desta mensagem foram bloqueadas.';
+
+$messages['encryptedmessage'] = 'Esta mensagem está criptografada e não pode ser exibida. Desculpe.';
+
+$messages['nocontactsfound'] = 'Nenhum contato foi encontrado.';
+
+$messages['sendingfailed'] = 'Falha no envia da mensagem';
+
+$messages['errorsaving'] = 'Um erro ocorreu enquanto durante o salvamento da mensagem';
+
+
+?>
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index e3437db4f..7120d07ca 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -99,63 +99,14 @@ function rcmail_mailbox_list($attrib)
 // var_dump($a_mailboxes);
 
   if ($type=='select')
-    $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox);
+    $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
    else
-    $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox);
+    $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
 
 
-/*
-  foreach ($a_folders as $i => $folder)
-    {
-    $zebra_class = $i%2 ? 'even' : 'odd';
-    $folder_prop = $a_subfolders[$folder];
-    $foldername = isset($folder_prop) ? $folder_prop['name'] : $folder;
-
-    $folder_lc = strtolower($foldername);
-    if (in_array($folder_lc, $special_mailboxes))
-      $foldername = rcube_label($folder_lc);
-        
-    if ($unread_count = $IMAP->messagecount($folder, 'UNSEEN'))
-      $foldername .= sprintf(' (%d)', $unread_count);
-
-    $indent = isset($folder_prop) ? sprintf(' indent%d', $folder_prop['level']) : '';
-    $indent_str = isset($folder_prop) ? str_repeat('&nbsp;&nbsp;', (int)$folder_prop['level']) : '';
-  
-    // compose mailbox line
-    if ($type=='select')
-      $out .= sprintf('<option value="%s">%s%s</option>'."\n",
-                      $folder,
-                      $indent_str,
-                      rep_specialchars_output($foldername));
-    
-    else
-      $out .= sprintf('<li class="mailbox %s %s%s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a></li>'."\n",
-                       preg_replace('/[^a-z0-9\-_]/', '', strtolower($folder)),
-                       $zebra_class,
-                       $unread_count ? ' unread' : '',
-                       $folder==$mbox ? ' selected' : '',
-                       $indent,
-                       $folder,
-                       $JS_OBJECT_NAME,
-                       $folder,
-                       $JS_OBJECT_NAME,
-                       $folder,
-                       rep_specialchars_output($foldername));
-    }
-*/
-
   if ($type=='ul')
     $OUTPUT->add_script(sprintf("%s.gui_object('mailboxlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));
 
-
-/*  this is added further up
-  if (!$s_added_script)
-    {
-    $javascript .= sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $mbox);
-    $OUTPUT->add_script($javascript);
-    $s_added_script = TRUE;
-    }
-*/
   return $out . "</$type>";
   }
 
@@ -192,7 +143,7 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
   
 
 // return html for a structured list <ul> for the mailbox tree
-function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLevel = 0)
+function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
   {
   global $JS_OBJECT_NAME, $IMAP;
 
@@ -208,7 +159,11 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLe
     else
       $foldername = $folder['name'];
 
-    if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN'))
+    // shorten the folder name to a given length
+    if ($maxlength && $maxlength>1)
+      $foldername = abbrevate_string($foldername, $maxlength);
+
+    if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN', ($folder['id']==$mbox)))
       $foldername .= sprintf(' (%d)', $unread_count);
 
     $out .= sprintf('<li class="mailbox %s %s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a>'."\n",
@@ -224,7 +179,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLe
                     rep_specialchars_output($foldername));
 
     if (!empty($folder['folders']))
-      $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $nestLevel+1) . "</ul>\n";
+      $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1) . "</ul>\n";
 
     $out .= "</li>\n";
     $idx++;
@@ -235,7 +190,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLe
 
 
 // return html for a flat list <select> for the mailbox tree
-function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $nestLevel=0)
+function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
   {
   global $IMAP;
 
@@ -243,13 +198,19 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $nest
   $out = '';
   foreach ($arrFolders as $key=>$folder)
     {
+    // shorten the folder name to a given length
+    if ($maxlength && $maxlength>1)
+      $foldername = abbrevate_string($folder['name'], $maxlength);
+    else
+      $foldername = $folder['name'];
+
     $out .= sprintf('<option value="%s">%s%s</option>'."\n",
                     $folder['id'],
                     str_repeat('&nbsp;', $nestLevel*4),
-                    rep_specialchars_output($folder['name']));
+                    rep_specialchars_output($foldername));
 
     if (!empty($folder['folders']))
-      $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $nestLevel+1);
+      $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1);
 
     $idx++;
     }
@@ -485,7 +446,7 @@ function rcmail_get_messagecount_text()
                                               'to'    => min($max, $start_msg + $IMAP->page_size - 1),
                                               'count' => $max)));
 
-  return $out;
+  return rep_specialchars_output($out);
   }
 
 
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 0ddf5cc11..1e9ce926b 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -20,7 +20,9 @@
 */
 
 $REMOTE_REQUEST = TRUE;
+$OUTPUT_TYPE = 'js';
 
+$unseen = $IMAP->messagecount($mbox, 'UNSEEN', !empty($_GET['_refresh']) ? TRUE : FALSE);
 $count = $IMAP->messagecount();
 
 // update message count display
@@ -31,7 +33,7 @@ $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text(
 
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox), $unseen);
 
 
 // add message rows
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index a7571e052..621acd96c 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -50,15 +50,13 @@ function rcmail_user_prefs_form($attrib)
                        'prettydate' => array('type' => 'text'));
                        
   // show language selection
+  $a_lang = rcube_list_languages();
+  asort($a_lang);
+  
   $field_id = 'rcmfd_lang';
   $select_lang = new select(array('name' => '_language', 'id' => $field_id));
-  $select_lang->add('Dansk', 'da');
-  $select_lang->add('Deutsch', 'de');
-  $select_lang->add('English', 'en');
-  $select_lang->add('Espanol', 'es');
-  $select_lang->add('Fran&ccedil;ais', 'fr');
-  $select_lang->add('Italiano', 'it');
-  $select_lang->add('Nederlands', 'nl');
+  $select_lang->add(array_values($a_lang), array_keys($a_lang));
+  
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 5ae46f151..5ebad537d 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -174,17 +174,26 @@
   font-weight: bold;  
 }
 
-#mailboxlist
+#mailboxlist-container
 {
   position: absolute;
   top: 100px;
   left: 20px;
   width: 160px;
+  bottom: 80px;
+  border: 1px solid #CCCCCC;
+  background-color: #F9F9F9;
+  overflow: auto;
+  /* css hack for IE */
+  height: expression((parseInt(document.documentElement.clientHeight)-180)+'px');
+}
+
+#mailboxlist
+{
+  width: 100%;
   height: auto;
   margin: 0px;
   padding: 0px;
-  border: 1px solid #CCCCCC;
-  background-color: #F9F9F9;
   list-style-image: none;
   list-style-type: none;
   overflow: hidden;
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 2c47cb67f..631f46d59 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -24,7 +24,8 @@
 </div>
 
 <div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div>
-<roundcube:object name="mailboxlist" id="mailboxlist" />
+<div id="mailboxlist-container"><roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" /></div>
+
 
 <div id="mailcontframe">
 <roundcube:object name="messages"