From 0615a69974d0101d3159511d416bb2c75ffa1ad9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 19 Feb 2006 13:32:27 -0500
Subject: [PATCH] Updated several localizations

---
 program/localization/fi/labels.inc      |   26 
 program/localization/sk/labels.inc      |   23 
 program/localization/lv/labels.inc      |   34 
 program/localization/de_CH/messages.inc |   90 ++
 program/localization/nl_NL/messages.inc |   72 +
 program/localization/de_CH/labels.inc   |  196 +++++
 program/localization/cz/labels.inc      |  185 ++--
 program/localization/de_DE/labels.inc   |   17 
 program/localization/se/labels.inc      |   85 +
 program/localization/ja/labels.inc      |   34 
 program/localization/ru/messages.inc    |   67 +
 program/localization/ee/labels.inc      |   21 
 program/localization/pt_BR/labels.inc   |  114 +-
 program/localization/cn/messages.inc    |   40 +
 program/localization/cn/labels.inc      |   60 +
 program/localization/da/messages.inc    |   19 
 program/localization/fr/messages.inc    |    6 
 program/localization/ru/labels.inc      |   85 +
 program/localization/tw/messages.inc    |    4 
 program/localization/de_DE/messages.inc |    6 
 program/localization/cz/messages.inc    |   71 -
 program/localization/tw/labels.inc      |    4 
 program/localization/se/messages.inc    |   63 +
 program/localization/pt_BR/messages.inc |   41 +
 program/localization/fr/labels.inc      |   14 
 program/localization/sk/messages.inc    |   11 
 program/localization/da/labels.inc      |   33 
 program/localization/nl_NL/labels.inc   |  156 ++-
 program/localization/ee/messages.inc    |   11 
 program/localization/ca/labels.inc      |  147 ++-
 program/localization/pl/labels.inc      |   46 
 program/localization/ja/messages.inc    |   35 
 program/localization/es/labels.inc      |   53 +
 program/localization/es/messages.inc    |   51 +
 program/localization/ca/messages.inc    |   74 +
 program/localization/fi/messages.inc    |   33 
 program/localization/index.inc          |    7 
 program/localization/lv/messages.inc    |   39 +
 38 files changed, 1,545 insertions(+), 528 deletions(-)

diff --git a/program/localization/ca/labels.inc b/program/localization/ca/labels.inc
index a8752e1..6b52d23 100644
--- a/program/localization/ca/labels.inc
+++ b/program/localization/ca/labels.inc
@@ -1,15 +1,14 @@
-<?php
+<?php
 
 /*
  +-----------------------------------------------------------------------+
  | language/ca/labels.inc                                                |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Miguel Canteras i Cañizares <miguel@canteras.org>             |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -20,32 +19,32 @@
 
 // login page
 $labels['username']  = 'Nom d\'usuari';
-$labels['password']  = 'Password';
+$labels['password']  = 'Contrasenya';
 $labels['server']    = 'Servidor';
 $labels['login']     = 'Entrar';
 
 // taskbar
-$labels['logout']   = 'Sortir';
+$labels['logout']   = 'Tancar sessió';
 $labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Configuració Personal';
-$labels['addressbook'] = 'Llibreta d\'adreces';
+$labels['settings'] = 'Configuració';
+$labels['addressbook'] = 'Contactes';
 
 // mailbox names
 $labels['inbox']  = 'Entrada';
 $labels['sent']   = 'Enviats';
 $labels['trash']  = 'Paperera';
 $labels['drafts'] = 'Esborranys';
-$labels['junk']   = 'Junk';
+$labels['junk']   = 'Correu brossa';
 
 // message listing
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
 $labels['to']      = 'Destinatari';
-$labels['cc']      = 'Còpia';
-$labels['bcc']     = 'Còpia Oculta';
+$labels['cc']      = 'CC';
+$labels['bcc']     = 'BCC';
 $labels['replyto'] = 'Respondre a';
 $labels['date']    = 'Data';
-$labels['size']    = 'Mida';
+$labels['size']    = 'Grandària';
 $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organització';
 
@@ -53,33 +52,33 @@
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Carpetes';
-$labels['messagesfromto'] = 'Missatges de $from a $to de $count';
+$labels['messagesfromto'] = 'Missatges des 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['filesize'] = 'Grandaria de fitxer';
 
-$labels['preferhtml'] = 'Prefereix HTML';
+$labels['preferhtml'] = 'Preferisc HTML';
 $labels['htmlmessage'] = 'Missatge HTML';
 $labels['prettydate'] = 'Dates curtes';
 
-$labels['addtoaddressbook'] = 'Afegir a la llibreta d\'adreces';
+$labels['addtoaddressbook'] = 'Afegir a contactes';
 
 // weekdays short
-$labels['sun'] = 'Dg';
-$labels['mon'] = 'Dl';
-$labels['tue'] = 'Dm';
-$labels['wed'] = 'Dc';
-$labels['thu'] = 'Dj';
-$labels['fri'] = 'Dv';
-$labels['sat'] = 'Ds';
+$labels['sun'] = 'DM';
+$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['monday']    = 'Dilluns';
 $labels['tuesday']   = 'Dimarts';
 $labels['wednesday'] = 'Dimecres';
 $labels['thursday']  = 'Dijous';
@@ -90,88 +89,112 @@
 
 // toolbar buttons
 $labels['writenewmessage']  = 'Crear nou missatge';
-$labels['replytomessage']   = 'Respondre el missatge';
-$labels['replytoallmessage'] = 'Respondre a tots';
-$labels['forwardmessage']   = 'Reenviar el missatge';
-$labels['deletemessage']    = 'Moure el missatge a la paperera';
+$labels['replytomessage']   = 'Respondre al missatge';
+$labels['replytoallmessage'] = 'Respondre al remitent i a tots els destinataris';
+$labels['forwardmessage']   = 'Reenviar missatge';
+$labels['deletemessage']    = 'Moure 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['previousmessages'] = 'Mostrar missatges anteriors';
+$labels['nextmessages']     = 'Mostrar missatges següents';
+$labels['backtolist']       = 'Tornar a la llista de missatges';
+$labels['viewsource']       = 'Visualitza el codi font';
 
-$labels['select'] = 'Selecciona';
+$labels['select'] = 'Seleccionar';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
-$labels['unread'] = 'Sense llegir';
+$labels['unread'] = 'No llegits';
+
+$labels['compact'] = 'Compacta';
+$labels['empty'] = 'Buida';
+$labels['purge'] = 'Purga';
+
+$labels['quota'] = 'Utilització de disc';
+
 
 // message compose
 $labels['compose']  = 'Escriure un missatge';
-$labels['sendmessage']  = 'Enviar el missatge ara';
+$labels['sendmessage']  = 'Enviar ara el missatge';
 $labels['addattachment']  = 'Afegir un fitxer';
+$labels['charset']  = 'Codificació de caràcters';
 
-$labels['attachments'] = 'Fitxers afegits';
-$labels['upload'] = 'Pujar-lo';
-$labels['close']  = 'Tancar';
+$labels['attachments'] = 'Adjunts';
+$labels['upload'] = 'Afegir';
+$labels['close']  = 'Cancel·lar';
 
 $labels['low']     = 'Baixa';
-$labels['lowest']  = 'La més baxia';
+$labels['lowest']  = 'Molt baixa';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alta';
-$labels['highest'] = 'La més alta';
+$labels['highest'] = 'Molt alta';
 
-$labels['showimages'] = 'Mostrar imatges';
+$labels['nosubject']  = '(sense assumpte)';
+$labels['showimages'] = 'Mostra imatges';
 
 
 // address boook
-$labels['name']      = 'Mostrar el nom';
+$labels['name']      = 'Nom a mostrar';
 $labels['firstname'] = 'Nom';
 $labels['surname']   = 'Cognom';
 $labels['email']     = 'E-Mail';
 
-$labels['addcontact'] = 'Afegir contacte';
+$labels['addcontact'] = 'Afegir nou contacte';
 $labels['editcontact'] = 'Editar contacte';
 
 $labels['edit']   = 'Editar';
-$labels['cancel'] = 'Cancel.lar';
-$labels['save']   = 'Guardar';
-$labels['delete'] = 'Esborrar';
+$labels['cancel'] = 'Cancel·lar';
+$labels['save']   = 'Desar';
+$labels['delete'] = 'Suprimir';
 
-$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['newcontact']     = 'Crear nou contacte';
+$labels['deletecontact']  = 'Suprimir contactes seleccionats';
+$labels['composeto']      = 'Redactar correu per a';
+$labels['contactsfromto'] = 'Contactes $from a $to de $count';
+$labels['print']          = 'Imprimeix';
 $labels['export']         = 'Exportar';
+
+// LDAP search
+$labels['ldapsearch'] = 'Cerca el directori LDAP';
+
+$labels['ldappublicsearchname']    = 'Nom de contacte';
+$labels['ldappublicsearchtype'] = 'Cerca exacta?';
+$labels['ldappublicserverselect'] = 'Selecciona els servidors';
+$labels['ldappublicsearchfield'] = 'Cerca activa';
+$labels['ldappublicsearchform'] = 'Cerca un contacte';
+$labels['ldappublicsearch'] = 'Cerca';
 
 
 // settings
-$labels['settingsfor']  = 'Opcions per';
+$labels['settingsfor']  = 'Configuració per a';
 
 $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['manageidentities']  = 'Gestionar identitats per a aquest compte';
 $labels['newidentity']  = 'Nova identitat';
 
-$labels['newitem']  = 'Nou item';
-$labels['edititem']  = 'Editar item';
+$labels['newitem']  = 'Nou';
+$labels['edititem']  = 'Editar';
 
-$labels['setdefault']  = 'Triar per defecte';
-$labels['language']  = 'Llengua';
+$labels['setdefault']  = 'Seleccionar opció per defecte';
+$labels['language']  = 'Idioma';
 $labels['timezone']  = 'Zona horària';
-$labels['pagesize']  = 'Fileres per pàgina';
+$labels['pagesize']  = 'Files per pàgina';
+$labels['signature'] = 'Signatura';
 
 
+$labels['folder']  = 'Carpeta';
 $labels['folders']  = 'Carpetes';
-$labels['foldername']  = 'Nom de la carpeta';
-$labels['subscribed']  = 'Suscrita';
+$labels['foldername']  = 'Nom de carpeta';
+$labels['subscribed']  = 'Subscriure\'s';
 $labels['create']  = 'Crear';
 $labels['createfolder']  = 'Crear nova carpeta';
-$labels['deletefolder']  = 'Esborrar carpeta';
+$labels['deletefolder']  = 'Suprimir carpeta';
 $labels['managefolders']  = 'Gestionar carpetes';
 
+$labels['sortby'] = 'Ordena per';
+$labels['sortasc']  = 'Ordena ascendentment';
+$labels['sortdesc'] = 'Ordena descendentment';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/ca/messages.inc b/program/localization/ca/messages.inc
index d633f7f..752cd60 100644
--- a/program/localization/ca/messages.inc
+++ b/program/localization/ca/messages.inc
@@ -1,56 +1,88 @@
-<?php
+<?php
 
 /*
  +-----------------------------------------------------------------------+
- | language/ca/messages.inc                                              |
+ | language/en/messages.inc                                              |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Miguel Canteras i Cañizares <miguel@canteras.org>             |
  +-----------------------------------------------------------------------+
 
- $Id$
+ $Id$ 
 
 */
 
 $messages = array();
 
-$messages['loginfailed']  = 'Accés Erroni';
+$messages['loginfailed']  = 'Contrasenya incorrecta';
 
-$messages['cookiesdisabled'] = 'El teu navegador no accepta cookies';
+$messages['cookiesdisabled'] = 'El seu navegador no accepta cookies';
 
-$messages['sessionerror'] = 'La teva sessió és invàlida o ha caducat';
+$messages['sessionerror'] = 'La seva sessió no existeix o ha expirat';
 
-$messages['imaperror'] = 'La conexió al servidor IMAP ha fallat';
+$messages['imaperror'] = 'Error de conexió amb el servidor IMAP';
 
-$messages['nomessagesfound'] = 'No hi ha missatges a aquesta bústia';
+$messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta bústia';
 
-$messages['loggedout'] = 'Has finalitzat la sessió correctament. Adèu!';
+$messages['loggedout'] = 'Ha tancat la sessió. Fins aviat!';
 
-$messages['mailboxempty'] = 'La bústia és buida';
+$messages['mailboxempty'] = 'La bústia està buida';
+
+$messages['loading'] = 'Carregant...';
 
 $messages['loadingdata'] = 'Carregant dades...';
 
-$messages['messagesent'] = 'Misstage enviat correctament';
+$messages['sendingmessage'] = 'Enviant missatge...';
 
-$messages['successfullysaved'] = 'Guardat correctament';
+$messages['messagesent'] = 'Missatge enviat correctament';
 
-$messages['addedsuccessfully'] = 'Contacte afegit correctament a la llibreta d´adreces';
+$messages['successfullysaved'] = 'Desat correctament';
 
-$messages['contactexists'] = 'Ja existeix un contacte amb aquest e-mail';
+$messages['addedsuccessfully'] = 'Contacte afegit correctament a la llibreta d\'adreces';
 
-$messages['blockedimages'] = 'Per protegir la teva privacitat les imatges remotes han estat bloquejades.';
+$messages['contactexists'] = 'Ja hi ha un contacte amb aquesta adreça de correu';
 
-$messages['encryptedmessage'] = 'És un missatge encriptat i no es pot mostrar. Ho sento!';
+$messages['blockedimages'] = 'Per a protegir la seva privacitat, les imatges remotes han sigut bloquejades en aquest missatge';
+
+$messages['encryptedmessage'] = 'Aquest és un missatge xifrat i no pot ser mostrat. Ho sento!';
 
 $messages['nocontactsfound'] = 'No hi ha contactes';
 
 $messages['sendingfailed'] = 'Error enviant missatge';
 
-$messages['errorsaving'] = 'Error mentre es guardava';
+$messages['errorsaving'] = 'Va ocórrer un error mentres es desava';
 
+$messages['errormoving'] = 'No s\'ha pogut moure el missatge';
 
-?>
\ No newline at end of file
+$messages['errordeleting'] = 'No s\'ha pogut eliminar el missatge';
+
+$messages['deletecontactconfirm']  = 'Realment vol suprimir el(s) contacte(s) selecionat(s)?';
+
+$messages['deletefolderconfirm']  = 'Realment vol suprimir aquesta carpeta?';
+
+$messages['formincomplete'] = 'El formulari no ha sigut emplenat totalment';
+
+$messages['noemailwarning'] = 'Introdueixi una direcció email vàlida';
+
+$messages['nonamewarning']  = 'Introdueixi un nom';
+
+$messages['nopagesizewarning'] = 'Introdueixi un tamany de pàgina';
+
+$messages['norecipientwarning'] = 'Introdueixi al menys un destinatari';
+
+$messages['nosubjectwarning']  = 'El camp "Assumpte" eatà buit. Vol introduir un ara?';
+
+$messages['nobodywarning'] = 'Vol enviar aquest missatge sense text?';
+
+$messages['notsentwarning'] = 'El missatge no s\'ha enviat. Vol descartar el seu missatge?';
+
+$messages['noldapserver'] = 'Seleccioni un servidor ldap per a cercar';
+
+$messages['nocontactsreturned'] = 'No s\'han trobat contactes';
+
+$messages['nosearchname'] = 'Introdueixi un nom de contacte o una direcció email';
+
+?>
diff --git a/program/localization/cn/labels.inc b/program/localization/cn/labels.inc
index 315775f..e1cbcc4 100644
--- a/program/localization/cn/labels.inc
+++ b/program/localization/cn/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2005/12/6                         |
+ |  Simplified-chinese utf-8 by winman 2006/02/19                        |
  |  Author: winman rong  <winman.rong@gmail.com>                         |
  +-----------------------------------------------------------------------+
 
@@ -35,7 +35,7 @@
 $labels['inbox']  = '收件箱';
 $labels['sent']   = '发件箱';
 $labels['trash']  = '垃圾桶';
-$labels['drafts'] = '早稿';
+$labels['drafts'] = '草稿';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
@@ -47,14 +47,14 @@
 $labels['replyto'] = '回复地址';
 $labels['date']    = '日期';
 $labels['size']    = '文件大小';
-$labels['priority'] = '优先权';
-$labels['organization'] = '机构';
+$labels['priority'] = '优先级';
+$labels['organization'] = '团体';
 
 // aliases
 $labels['reply-to'] = $labels['回复到'];
 
 $labels['mailboxlist'] = '文件夹';
-$labels['messagesfromto'] = '邮件 $from 到 $to 总共 $count';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
 $labels['moveto']   = '移动到...';
@@ -94,21 +94,27 @@
 $labels['replytomessage']   = '回复邮件';
 $labels['forwardmessage']   = '转发邮件';
 $labels['deletemessage']    = '把邮件移动到垃圾桶';
-$labels['printmessage']     = '打印这封邮件';
-$labels['previousmessages'] = '查看上一封邮件';
-$labels['nextmessages']     = '查看下一封邮件';
-$labels['backtolist']       = '返回邮件列表';
+$labels['printmessage']     = '打印邮件';
+$labels['previousmessages'] = '上一封邮件';
+$labels['nextmessages']     = '下一封邮件';
+$labels['backtolist']       = '返回收件箱';
 $labels['viewsource']       = '显示源代码';
 
 $labels['select'] = '选择';
 $labels['all'] = '全部';
-$labels['none'] = '没有';
-$labels['unread'] = '还没读过的';
+$labels['none'] = '不选';
+$labels['unread'] = '没读过的';
+
+$labels['compact'] = 'Compact';
+$labels['empty'] = '空的';
+$labels['purge'] = '清除';
+
+$labels['quota'] = '空间使用';
 
 // message compose
 $labels['compose']  = '写新邮件';
 $labels['sendmessage']  = '立刻发送邮件';
-$labels['addattachment']  = '附加一个文件';
+$labels['addattachment']  = '添加附件';
 
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
@@ -120,6 +126,7 @@
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
+$labels['nosubject']  = '(没有主题)';
 $labels['showimages'] = '显示图片';
 
 
@@ -138,23 +145,35 @@
 $labels['delete'] = '删除';
 
 $labels['newcontact']     = '建立新的联系信息';
-$labels['deletecontact']  = '删除所选择的联系信息';
+$labels['addcontact']     = '将联系人添加到地址薄';
+$labels['deletecontact']  = '删除选择的联系信息';
 $labels['composeto']      = '给所选择的联系人发送邮件';
-$labels['contactsfromto'] = '联系人 $from 到 $to 总共 $count';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print']          = '打印';
 $labels['export']         = '导出';
 
 
+// LDAP search
+$labels['ldapsearch'] = 'LDAP 目录搜索';
+
+$labels['ldappublicsearchname']    = '联系人名字';
+$labels['ldappublicsearchtype'] = '精确匹配?';
+$labels['ldappublicserverselect'] = '选择服务器';
+$labels['ldappublicsearchfield'] = 'Search on';
+$labels['ldappublicsearchform'] = 'Look for a contact';
+$labels['ldappublicsearch'] = '搜索';
+
+
 // settings
-$labels['settingsfor']  = 'Settings for';
+$labels['settingsfor']  = '设置';
 
 $labels['preferences']  = '参数选择';
 $labels['userpreferences']  = '用户参数';
 $labels['editpreferences']  = '编辑用户参数';
 
 $labels['identities']  = '发件人身份';
-$labels['manageidentities']  = '管理帐号资料';
-$labels['newidentity']  = '建立新标识';
+$labels['manageidentities']  = '管理发件人资料';
+$labels['newidentity']  = '建立新身份';
 
 $labels['newitem']  = 'New item';
 $labels['edititem']  = 'Edit item';
@@ -162,9 +181,11 @@
 $labels['setdefault']  = '设置为默认';
 $labels['language']  = '语言';
 $labels['timezone']  = '时区';
-$labels['pagesize']  = '每页邮件数';
+$labels['pagesize']  = '每页行数';
+$labels['signature'] = '签名';
 
 
+$labels['folder']  = '文件夹';
 $labels['folders']  = '文件夹';
 $labels['foldername']  = '文件夹名称';
 $labels['subscribed']  = '显示与否';
@@ -173,5 +194,8 @@
 $labels['deletefolder']  = '删除文件夹';
 $labels['managefolders']  = '管理文件夹';
 
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = '由小到大排列';
+$labels['sortdesc'] = '由大到小排列';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/cn/messages.inc b/program/localization/cn/messages.inc
index 2c01a88..067c3a5 100644
--- a/program/localization/cn/messages.inc
+++ b/program/localization/cn/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2005/12/6                         |
+ |  Simplified-chinese utf-8 by winman 2006/02/19                        |
  |  Author: winman rong  <winman.rong@gmail.com>                         |
  +-----------------------------------------------------------------------+
 
@@ -23,7 +23,7 @@
 
 $messages['cookiesdisabled'] = '你的浏览器目前关闭了cookies,请打开cookies再试';
 
-$messages['sessionerror'] = '当前 session 无效或者超时 ';
+$messages['sessionerror'] = '当前 session 无效或者超时';
 
 $messages['imaperror'] = '不能连接IMAP服务器';
 
@@ -31,15 +31,19 @@
 
 $messages['loggedout'] = '成功结束当前会话. 再见!';
 
-$messages['mailboxempty'] = '邮箱现在是空的';
+$messages['mailboxempty'] = '邮箱是空的';
+
+$messages['loading'] = '读取...';
 
 $messages['loadingdata'] = '读取数据...';
+
+$messages['sendingmessage'] = '正在发送邮件...';
 
 $messages['messagesent'] = '邮件发送成功';
 
 $messages['successfullysaved'] = '保存成功';
 
-$messages['addedsuccessfully'] = '联系信息已经成功增加到地址薄';
+$messages['addedsuccessfully'] = '联系信息成功增加到地址薄';
 
 $messages['contactexists'] = '这个邮件地址已经存在';
 
@@ -57,5 +61,33 @@
 
 $messages['errordeleting'] = '删除邮件出错';
 
+$messages['deletecontactconfirm']  = '你确定要删除所选择的联系人信息吗?';
+
+$messages['deletefolderconfirm']  = '你确定要删除此文件夹吗?';
+
+$messages['purgefolderconfirm']  = '你确定要删除此文件夹里所有邮件吗?';
+
+$messages['formincomplete'] = '表格没有填写完全';
+
+$messages['noemailwarning'] = '请输入有效的电子邮件地址';
+
+$messages['nonamewarning']  = '请输入名字';
+
+$messages['nopagesizewarning'] = '请输入行数';
+
+$messages['norecipientwarning'] = '请输入至少一个收件人地址';
+
+$messages['nosubjectwarning']  = '邮件主题还没输入. 你想现在输入吗?';
+
+$messages['nobodywarning'] = '邮件没写内容,确定发送吗?';
+
+$messages['notsentwarning'] = '邮件没有发送. 你要取消这封邮件吗?';
+
+$messages['noldapserver'] = '请选择要搜索的LDAP服务器';
+
+$messages['nocontactsreturned'] = '没有联系人信息';
+
+$messages['nosearchname'] = '请输入一个联系人名字或者电子邮件地址';
+
 
 ?>
\ No newline at end of file
diff --git a/program/localization/cz/labels.inc b/program/localization/cz/labels.inc
index faf2d96..c942fa0 100755
--- a/program/localization/cz/labels.inc
+++ b/program/localization/cz/labels.inc
@@ -19,31 +19,31 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'Uћivatel';
+$labels['username']  = 'Uživatel';
 $labels['password']  = 'Heslo';
 $labels['server']    = 'Server';
-$labels['login']     = 'Pшihlбsit';
+$labels['login']     = 'Přihlásit';
 
 // taskbar
-$labels['logout']   = 'Odhlбsit';
+$labels['logout']   = 'Odhlásit';
 $labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Osobnн nastavenн';
-$labels['addressbook'] = 'Adresбш';
+$labels['settings'] = 'Osobní nastavení';
+$labels['addressbook'] = 'Adresář';
 
 // mailbox names
-$labels['inbox']  = 'Pшнchozн poљta';
-$labels['sent']   = 'Odeslanй';
-$labels['trash']  = 'Koљ';
-$labels['drafts'] = 'Rozepsanй';
-$labels['junk']   = 'Nevyћбdanб poљta';
+$labels['inbox']  = 'Příchozí pošta';
+$labels['sent']   = 'Odeslané';
+$labels['trash']  = 'Koš';
+$labels['drafts'] = 'Rozepsané';
+$labels['junk']   = 'Nevyžádaná pošta';
 
 // message listing
-$labels['subject'] = 'Pшedmмt';
+$labels['subject'] = 'Předmět';
 $labels['from']    = 'Odesilatel';
-$labels['to']      = 'Adresбt';
+$labels['to']      = 'Adresát';
 $labels['cc']      = 'Kopie';
-$labels['bcc']     = 'Slepб';
-$labels['replyto'] = 'Odpovмп na';
+$labels['bcc']     = 'Slepá';
+$labels['replyto'] = 'Odpověď na';
 $labels['date']    = 'Datum';
 $labels['size']    = 'Velikost';
 $labels['priority'] = 'Priorita';
@@ -52,92 +52,93 @@
 // aliases
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Sloћky';
-$labels['messagesfromto'] = 'Zprбvy od $from do $to z celkem $count';
-$labels['messagenrof'] = 'Zprбva $nr z $count';
+$labels['mailboxlist'] = 'Složky';
+$labels['messagesfromto'] = 'Zprávy od $from do $to z celkem $count';
+$labels['messagenrof'] = 'Zpráva $nr z $count';
 
-$labels['moveto']   = 'pшesunout do...';
-$labels['download'] = 'stбhnout';
+$labels['moveto']   = 'přesunout do...';
+$labels['download'] = 'stáhnout';
 
-$labels['filename'] = 'Jmйno pшнlohy';
-$labels['filesize'] = 'Velikost pшнlohy';
+$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ин data';
+$labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
+$labels['htmlmessage'] = 'HTML zpráva';
+$labels['prettydate'] = 'Hezčí data';
 
-$labels['addtoaddressbook'] = 'Pшidat do adresбшe';
+$labels['addtoaddressbook'] = 'Přidat do adresáře';
 
 // weekdays short
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
-$labels['tue'] = 'Ъt';
+$labels['tue'] = 'Út';
 $labels['wed'] = 'St';
-$labels['thu'] = 'Иt';
-$labels['fri'] = 'Pб';
+$labels['thu'] = 'Čt';
+$labels['fri'] = 'Pá';
 $labels['sat'] = 'So';
 
 // weekdays long
-$labels['sunday']    = 'Nedмle';
-$labels['monday']    = 'Pondмlн';
-$labels['tuesday']   = 'Ъterэ';
-$labels['wednesday'] = 'Stшeda';
-$labels['thursday']  = 'Иtvrtek';
-$labels['friday']    = 'Pбtek';
+$labels['sunday']    = 'Neděle';
+$labels['monday']    = 'Pondělí';
+$labels['tuesday']   = 'Úterý';
+$labels['wednesday'] = 'Středa';
+$labels['thursday']  = 'Čtvrtek';
+$labels['friday']    = 'Pátek';
 $labels['saturday']  = 'Sobota';
 
 $labels['today'] = 'Dnes';
 
 // toolbar buttons
-$labels['writenewmessage']  = 'Vytvoшit novou zprбvu';
-$labels['replytomessage']   = 'Odpovмdмt odesilateli';
-$labels['forwardmessage']   = 'Pшedat zprбvu';
-$labels['deletemessage']    = 'Pшesunout do koљe';
-$labels['printmessage']     = 'Vytisknout zprбvu';
-$labels['previousmessages'] = 'Zobrazit pшedchozн zprбvy';
-$labels['nextmessages']     = 'Zobrazit dalљн zprбvy';
-$labels['backtolist']       = 'Zpмt do seznamu zprбv';
+$labels['writenewmessage']  = 'Vytvořit novou zprávu';
+$labels['replytomessage']   = 'Odpovědět odesilateli';
+$labels['replytoallmessage'] = 'Odpovědět všem';
+$labels['forwardmessage']   = 'Předat zprávu';
+$labels['deletemessage']    = 'Přesunout do koše';
+$labels['printmessage']     = 'Vytisknout zprávu';
+$labels['previousmessages'] = 'Zobrazit předchozí zprávy';
+$labels['nextmessages']     = 'Zobrazit další zprávy';
+$labels['backtolist']       = 'Zpět do seznamu zpráv';
 $labels['viewsource']       = 'Zobrazit zdroj';
 
 $labels['select'] = 'Vybrat';
-$labels['all'] = 'Vљe';
+$labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
-$labels['unread'] = 'Nepшeиtenй';
+$labels['unread'] = 'Nepřečtené';
 
 // message compose
-$labels['compose']  = 'Napsat zprбvu';
-$labels['sendmessage']  = 'Odeslat zprбvu nynн';
-$labels['addattachment']  = 'Pшidat pшнlohu';
+$labels['compose']  = 'Napsat zprávu';
+$labels['sendmessage']  = 'Odeslat zprávu nyní';
+$labels['addattachment']  = 'Přidat přílohu';
 
-$labels['attachments'] = 'Pшнlohy';
-$labels['upload'] = 'Nahrбt';
-$labels['close']  = 'Zavшнt';
+$labels['attachments'] = 'Přílohy';
+$labels['upload'] = 'Nahrát';
+$labels['close']  = 'Zavřít';
 
-$labels['low']     = 'Nнzkб';
-$labels['lowest']  = 'Nejniћљн';
-$labels['normal']  = 'Normalnн';
-$labels['high']    = 'Vysokб';
-$labels['highest'] = 'Nejvyљљн';
+$labels['low']     = 'Nízká';
+$labels['lowest']  = 'Nejnižší';
+$labels['normal']  = 'Normalní';
+$labels['high']    = 'Vysoká';
+$labels['highest'] = 'Nejvyšší';
 
-$labels['showimages'] = 'Zobrazit obrбzky';
+$labels['showimages'] = 'Zobrazit obrázky';
 
 
 // address boook
-$labels['name']      = 'Zobrazit jmйno';
-$labels['firstname'] = 'Jmйno';
-$labels['surname']   = 'Pшнjmenн';
+$labels['name']      = 'Zobrazit jméno';
+$labels['firstname'] = 'Jméno';
+$labels['surname']   = 'Příjmení';
 $labels['email']     = 'E-Mail';
 
-$labels['addcontact'] = 'Pшidat kontakt';
+$labels['addcontact'] = 'Přidat kontakt';
 $labels['editcontact'] = 'Upravit kontakt';
 
 $labels['edit']   = 'Upravit';
 $labels['cancel'] = 'Konec';
-$labels['save']   = 'Uloћit';
+$labels['save']   = 'Uložit';
 $labels['delete'] = 'Smazat';
 
-$labels['newcontact']     = 'Vytvoшit novэ kontakt';
-$labels['deletecontact']  = 'Smazat vybranй kontakty';
+$labels['newcontact']     = 'Vytvořit nový kontakt';
+$labels['deletecontact']  = 'Smazat vybrané kontakty';
 $labels['composeto']      = 'Poslat mail';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z celkem $count';
 $labels['print']          = 'Tisk';
@@ -145,32 +146,54 @@
 
 
 // settings
-$labels['settingsfor']  = 'Nastavenн pro';
+$labels['settingsfor']  = 'Nastavení pro';
 
 $labels['preferences']  = 'Vlastnosti';
-$labels['userpreferences']  = 'Vlastnosti uћivatele';
-$labels['editpreferences']  = 'Upravit vlastnosti uћivatele';
+$labels['userpreferences']  = 'Vlastnosti uživatele';
+$labels['editpreferences']  = 'Upravit vlastnosti uživatele';
 
 $labels['identities']  = 'Profily';
-$labels['manageidentities']  = 'Spravovat profily u tohoto ъиtu';
-$labels['newidentity']  = 'Novб profil';
+$labels['manageidentities']  = 'Spravovat profily u tohoto účtu';
+$labels['newidentity']  = 'Nová profil';
 
-$labels['newitem']  = 'Novб poloћka';
-$labels['edititem']  = 'Upravit poloѕku';
+$labels['newitem']  = 'Nová položka';
+$labels['edititem']  = 'Upravit položku';
 
-$labels['setdefault']  = 'Nastavit vэchozн';
+$labels['setdefault']  = 'Nastavit výchozí';
 $labels['language']  = 'Jazyk';
-$labels['timezone']  = 'Иasovб zуna';
-$labels['pagesize']  = 'Шбdkщ na strбnku';
+$labels['timezone']  = 'Časová zóna';
+$labels['pagesize']  = 'Řádků na stránku';
 
 
-$labels['folders']  = 'Sloћky';
-$labels['foldername']  = 'Jmйno sloћky';
-$labels['subscribed']  = 'Podepsanй';
-$labels['create']  = 'Vytvoшit';
-$labels['createfolder']  = 'Vytvoшit novou sloћku';
-$labels['deletefolder']  = 'Smazat sloћku';
-$labels['managefolders']  = 'Spravovat sloћky';
+$labels['folders']  = 'Složky';
+$labels['folder']  = 'Složka';
+$labels['foldername']  = 'Jméno složky';
+$labels['subscribed']  = 'Podepsané';
+$labels['create']  = 'Vytvořit';
+$labels['createfolder']  = 'Vytvořit novou složku';
+$labels['deletefolder']  = 'Smazat složku';
+$labels['managefolders']  = 'Spravovat složky';
 
 
-?>
+$labels['compact'] = 'Kompaktní';
+$labels['empty'] = 'Prázdný';
+$labels['purge'] = 'Vyprázdnit';
+$labels['quota'] = 'Využití schránky';
+
+$labels['sortby']   = 'Seřadit podle';
+$labels['sortdesc'] = 'Seřadit sestupně';
+$labels['sortasc']  = 'Seřadit vzestupně';
+
+$labels['nosubject']  = '(bez předmětu)';
+$labels['signature'] = 'Podpis';
+$labels['charset']  = 'Znaková sada';
+
+$labels['ldapsearch'] = 'Hledat v LDAP adresáři';
+$labels['ldappublicsearchname']    = 'Jméno kontaktu';
+$labels['ldappublicsearchtype'] = 'Doslovné znění?';
+$labels['ldappublicserverselect'] = 'Zvolit servery';
+$labels['ldappublicsearchfield'] = 'Hledat na';
+$labels['ldappublicsearchform'] = 'Hledat kontakt';
+$labels['ldappublicsearch'] = 'Hledat';
+
+?>
\ No newline at end of file
diff --git a/program/localization/cz/messages.inc b/program/localization/cz/messages.inc
index 568a903..1b56d60 100755
--- a/program/localization/cz/messages.inc
+++ b/program/localization/cz/messages.inc
@@ -18,42 +18,39 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Pшihlбљenн selhalo';
+$messages['loginfailed']  = 'Přihlášení selhalo';
+$messages['cookiesdisabled'] = 'Váš prohlížeč nepodporuje cookies, které jsou pro přihlášení nutné';
+$messages['sessionerror'] = 'Vaše přihlášení je neplatné nebo vypršelo';
+$messages['imaperror'] = 'Připojení na IMAP server selhalo';
+$messages['nomessagesfound'] = 'Ve schránce nebyla nalezena žádná zpráva';
+$messages['loggedout'] = 'Byli jste úspěšně odhlášeni. Nashledanou!';
+$messages['mailboxempty'] = 'Schránka je prázdná';
+$messages['loadingdata'] = 'Načítám data...';
+$messages['messagesent'] = 'Zpráva byla odeslána';
+$messages['successfullysaved'] = 'Uloženo';
+$messages['addedsuccessfully'] = 'Kontakt byl úspěšně přidán do adresáře';
+$messages['contactexists'] = 'Kontakt se zadanou e-mailovou adresou již existuje';
+$messages['blockedimages'] = 'Z bezpečnostních důvodů byly zablokovány obrázky ve zprávě.';
+$messages['encryptedmessage'] = 'Tato zpráva je zašifrovaná a nelze ji zobrazit.';
+$messages['nocontactsfound'] = 'Nemáte žádné kontakty';
+$messages['sendingfailed'] = 'Odesílání zprávy selhalo';
+$messages['errorsaving'] = 'Vyskytla se chyba při ukládání';
+$messages['errormoving'] = 'Nemohu přesunout zprávu';
+$messages['errordeleting'] = 'Nemohu smazat zprávu';
 
-$messages['cookiesdisabled'] = 'Vбљ prohlнћeи nepodporuje cookies, kterй jsou pro pшihlбљenн nutnй';
+$messages['loading'] = 'Načítám...';
+$messages['sendingmessage'] = 'Odesílám zprávu...';
+$messages['noemailwarning'] = 'Zadejte, prosím, platnou adresu';
+$messages['nonamewarning']  = 'Zadejte, prosím, jméno';
+$messages['nopagesizewarning'] = 'Zadejte, prosím, velikost stránky';
+$messages['formincomplete']    = 'Formulář nebyl korektně vyplněn';
+$messages['norecipientwarning'] = 'Zadejte, prosím, alespoň jednoho příjemce';
+$messages['nosubjectwarning']  = 'Předmět nebyl vyplňen. Přejete si jej zadat nyní?';
+$messages['nobodywarning'] = 'Opravdu chtete odeslat prázdnou zprávu?';
+$messages['deletefolderconfirm']  = 'Chcete opravdu smazat tento adresář?';
+$messages['notsentwarning'] = 'Zpráva nebyla odeslána. Přejete si zprávu zahodit?';
+$messages['noldapserver'] = 'Zvolte, prosím, ldap server k hledání';
+$messages['nocontactsreturned'] = 'Nebyly nalezeny žádné kontakty';
+$messages['nosearchname'] = 'Zadejte, prosím, jméno nebo e-mail kontaktu';
 
-$messages['sessionerror'] = 'Vaљe pшihlбљenн je neplatnй nebo vyprљelo';
-
-$messages['imaperror'] = 'Pшipojenн na IMAP server selhalo';
-
-$messages['nomessagesfound'] = 'Ve schrбnce nebyla nalezena ћбdnб zprбva';
-
-$messages['loggedout'] = 'Byli jste ъspмљnм odhlбљeni. Nashledanou!';
-
-$messages['mailboxempty'] = 'Schrбnka je prбzdnб';
-
-$messages['loadingdata'] = 'Naинtбm data...';
-
-$messages['messagesent'] = 'Zprбva byla odeslбna';
-
-$messages['successfullysaved'] = 'Uloћeno';
-
-$messages['addedsuccessfully'] = 'Kontakt byl ъspмљnм pшidбn do adresбшe';
-
-$messages['contactexists'] = 'Kontakt se zadanou e-mailovou adresou jiћ existuje';
-
-$messages['blockedimages'] = 'Z bezpeиnostnнch dщvodщ byly zablokovбny obrбzky ve zprбvм.';
-
-$messages['encryptedmessage'] = 'Tato zprбva je zaљifrovanб a nelze ji zobrazit.';
-
-$messages['nocontactsfound'] = 'Nemбte ћбdnй kontakty';
-
-$messages['sendingfailed'] = 'Odesнlбnн zprбvy selhalo';
-
-$messages['errorsaving'] = 'Vyskytla se chyba pшi uklбdбnн';
-
-$messages['errormoving'] = 'Nemohu pшesunout zprбvu';
-
-$messages['errordeleting'] = 'Nemohu smazat zprбvu';
-
-?>
+?>
\ No newline at end of file
diff --git a/program/localization/da/labels.inc b/program/localization/da/labels.inc
index 28e1abe..6a9137f 100644
--- a/program/localization/da/labels.inc
+++ b/program/localization/da/labels.inc
@@ -6,7 +6,7 @@
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
+ | All rights reserved.                                                  |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
@@ -66,7 +66,6 @@
 
 $labels['preferhtml'] = 'Foretræk HTML';
 $labels['htmlmessage'] = 'HTML besked';
-$labels['prettydate'] = 'Pæn datovisning';
 
 $labels['addtoaddressbook'] = 'Tilføj til adressebogen';
 
@@ -93,7 +92,6 @@
 // toolbar buttons
 $labels['writenewmessage']  = 'Opret en ny besked';
 $labels['replytomessage']   = 'Svar på denne besked';
-$labels['replytoallmessage'] = 'Svar alle';
 $labels['forwardmessage']   = 'Videresend denne besked';
 $labels['deletemessage']    = 'Flyt beskeden til skrald';
 $labels['printmessage']     = 'Udskriv denne besked';
@@ -111,7 +109,6 @@
 $labels['sendmessage']  = 'Send beskeden nu';
 $labels['addattachment']  = 'Vedhæft en fil';
 
-$labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Upload';
 $labels['close']  = 'Luk';
 
@@ -172,5 +169,33 @@
 $labels['deletefolder']  = 'Slet folder';
 $labels['managefolders']  = 'Styr foldere';
 
+$labels['attachments'] = 'Vedhæftninger';
+$labels['prettydate']  = 'Pæn datovisning';
+$labels['print']       = 'Print';
+$labels['export']      = 'Eksport';
+$labels['viewsource']  = 'Vis rå besked';
+$labels['replytoallmessage'] = 'Svar til alle modtagere';
+
+$labels['folder']  = 'Folder';
+$labels['compact'] = 'Ryd op';
+$labels['empty'] = 'Tom';
+$labels['purge'] = 'Tøm';
+$labels['quota'] = 'Disk forbrug';
+
+$labels['sortby']   = 'Sortér efter';
+$labels['sortdesc'] = 'Nyeste først';
+$labels['sortasc']  = 'Ældste først';
+
+$labels['nosubject']  = '(intet emne)';
+$labels['signature'] = 'Signatur';
+$labels['charset']  = 'Tegnsæt';
+
+$labels['ldapsearch'] = 'LDAP kartotekssøgning';
+$labels['ldappublicsearchname']    = 'Kontaktens navn';
+$labels['ldappublicsearchtype'] = 'Præcis søgning?';
+$labels['ldappublicserverselect'] = 'Vælg servere';
+$labels['ldappublicsearchfield'] = 'Søg på';
+$labels['ldappublicsearchform'] = 'Søg efter en kontakt';
+$labels['ldappublicsearch'] = 'Søg';
 
 ?>
diff --git a/program/localization/da/messages.inc b/program/localization/da/messages.inc
index b57c8e2..c5cbefb 100644
--- a/program/localization/da/messages.inc
+++ b/program/localization/da/messages.inc
@@ -6,7 +6,7 @@
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
+ | All rights reserved.                                                  |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
@@ -54,5 +54,22 @@
 
 $messages['errorsaving'] = 'Der opstod en fejl ved lagring af data';
 
+$messages['loading'] = 'Indlæser...';
+$messages['sendingmessage'] = 'Sender besked...';
+$messages['errormoving']    = 'Kunne ikke flytte beskeden';
+$messages['errordeleting']  = 'Kunne ikke slette beskeden';
+$messages['noemailwarning'] = 'Indtast venligst en gyldig email adresse';
+$messages['nonamewarning']  = 'Angiv venligst et navn';
+$messages['nopagesizewarning'] = 'Angiv sidestørrelsen';
+$messages['formincomplete']    = 'Formularen var ikke fuldstændig fyldt ud';
+$messages['norecipientwarning'] = 'Indtast mindst én modtager';
+$messages['nosubjectwarning']  = '"Emne" feltet er tomt. Kunne du tænke dig at skrive et nu?';
+$messages['nobodywarning'] = 'Send denne besked uden tekst?';
+$messages['deletefolderconfirm']  = 'Vil du virkelig slette denne folder?';
+$messages['notsentwarning'] = 'Beskeden er ikke blevet sendt. Vil du kassere din besked?';
+
+$messages['noldapserver'] = 'Vælg venligst hvilken LDAP server der skal søges i';
+$messages['nocontactsreturned'] = 'Ingen kontakter blev fundet';
+$messages['nosearchname'] = 'Indtast venligst en kontakts navn eller email adresse';
 
 ?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
new file mode 100644
index 0000000..542d16f
--- /dev/null
+++ b/program/localization/de_CH/labels.inc
@@ -0,0 +1,196 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/de_CH/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>                   |
+ | Corrections: Alexander Stiebing <ja.stiebing[NOSPAM]@web.de>          |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page // Login-Seite
+$labels['username']  = 'Benutzername';
+$labels['password']  = 'Passwort';
+$labels['server']    = 'Server';
+$labels['login']     = 'Login';
+
+// taskbar // Aktionsleiste
+$labels['logout']   = 'Logout';
+$labels['mail']     = 'E-Mail';
+$labels['settings'] = 'Einstellungen';
+$labels['addressbook'] = 'Adressbuch';
+
+// mailbox names // E-Mail-Ordnernamen
+$labels['inbox']  = 'Posteingang';
+$labels['sent']   = 'Gesendet';
+$labels['trash']  = 'Gelöscht';
+$labels['drafts'] = 'Vorlagen';
+$labels['junk']   = 'Junk';
+
+// message listing // Nachrichtenliste
+$labels['subject'] = 'Betreff';
+$labels['from']    = 'Absender';
+$labels['to']      = 'Empfänger';
+$labels['cc']      = 'Kopie (CC)';
+$labels['bcc']     = 'Blind-Kopie';
+$labels['replyto'] = 'Antwort an';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grösse';
+$labels['priority'] = 'Priorität';
+$labels['organization'] = 'Organisation';
+
+// aliases // [Platzhalter]
+$labels['reply-to'] = $labels['replyto'];
+
+$labels['mailboxlist'] = 'Ordner';
+$labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
+$labels['messagenrof'] = 'Nachricht $nr von $count';
+
+$labels['moveto']   = 'Verschieben nach...';
+$labels['download'] = 'Download';
+
+$labels['filename'] = 'Dateiname';
+$labels['filesize'] = 'Dateigrösse';
+
+$labels['preferhtml'] = 'HTML bevorzugen';
+$labels['htmlmessage'] = 'HTML Nachricht';
+$labels['prettydate'] = 'Kurze Datumsanzeige';
+
+$labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
+
+// weekdays short // Wochentage (Abkürzungen) 
+$labels['sun'] = 'So';
+$labels['mon'] = 'Mo';
+$labels['tue'] = 'Di';
+$labels['wed'] = 'Mi';
+$labels['thu'] = 'Do';
+$labels['fri'] = 'Fr';
+$labels['sat'] = 'Sa';
+
+// weekdays long // Wochentage (normal)
+$labels['sunday']    = 'Sonntag';
+$labels['monday']    = 'Montag';
+$labels['tuesday']   = 'Dienstag';
+$labels['wednesday'] = 'Mittwoch';
+$labels['thursday']  = 'Donnerstag';
+$labels['friday']    = 'Freitag';
+$labels['saturday']  = 'Samstag';
+
+$labels['today'] = 'Heute';
+
+// toolbar buttons // Symbolleisten-Tipps
+$labels['writenewmessage']  = 'Neue Nachricht schreiben';
+$labels['replytomessage']   = 'Antwort verfassen';
+$labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger';
+$labels['forwardmessage']   = 'Nachricht weiterleiten';
+$labels['deletemessage']    = 'In den Papierkorb verschieben';
+$labels['printmessage']     = 'Diese Nachricht drucken';
+$labels['previousmessages'] = 'Vorherige Nachrichten anzeigen';
+$labels['nextmessages']     = 'Weitere Nachrichten anzeigen';
+$labels['backtolist']       = 'Zurück zur Liste';
+
+$labels['select'] = 'Auswählen';
+$labels['all']    = 'Alle';
+$labels['none']   = 'Keine';
+$labels['unread'] = 'Ungelesene';
+
+$labels['compact'] = 'Packen';
+$labels['empty'] = 'Leeren';
+$labels['purge'] = 'Aufräumen';
+
+// message compose // Nachrichten erstellen
+$labels['compose']  = 'Neue Nachricht verfassen';
+$labels['sendmessage']  = 'Nachricht jetzt senden';
+$labels['addattachment']  = 'Datei anfügen';
+$labels['charset']  = 'Zeichensatz';
+
+$labels['attachments'] = 'Anhänge';
+$labels['upload'] = 'Hochladen';
+$labels['close']  = 'Schliessen';
+
+$labels['low']     = 'Niedrig';
+$labels['lowest']  = 'Niedrigste';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hoch';
+$labels['highest'] = 'Höchste';
+
+$labels['nosubject']  = '(kein Betreff)';
+$labels['showimages'] = 'Bilder anzeigen';
+
+
+// address book // Adressbuch
+$labels['name']      = 'Anzeigename';
+$labels['firstname'] = 'Vorname';
+$labels['surname']   = 'Nachname';
+$labels['email']     = 'E-Mail';
+
+$labels['addcontact'] = 'Kontakt hinzufügen';
+$labels['editcontact'] = 'Kontakt bearbeiten';
+
+$labels['edit']   = 'Bearbeiten';
+$labels['cancel'] = 'Abbrechen';
+$labels['save']   = 'Speichern';
+$labels['delete'] = 'Löschen';
+
+$labels['newcontact']     = 'Neuen Kontakt erfassen';
+$labels['deletecontact']  = 'Gewählte Kontakte löschen';
+$labels['composeto']      = 'Nachricht verfassen';
+$labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
+$labels['print']          = 'Drucken';
+$labels['export']         = 'Exportieren';
+
+// LDAP search
+$labels['ldapsearch'] = 'LDAP Verzeichnis-Suche';
+
+$labels['ldappublicsearchname']   = 'Kontakt-Name';
+$labels['ldappublicsearchtype']   = 'Genaue Übereinstimmung';
+$labels['ldappublicserverselect'] = 'Server-Auswahl';
+$labels['ldappublicsearchfield']  = 'Suche in';
+$labels['ldappublicsearchform']   = 'Adressen suchen';
+$labels['ldappublicsearch'] = 'Suchen';
+
+// settings // Einstellungen
+$labels['settingsfor']  = 'Einstellungen für';
+
+$labels['preferences']  = 'Einstellungen';
+$labels['userpreferences']  = 'Benutzereinstellungen';
+$labels['editpreferences']  = 'Einstellungen bearbeiten';
+
+$labels['identities']  = 'Absender';
+$labels['manageidentities']  = 'Absender für dieses Konto verwalten';
+$labels['newidentity']  = 'Neuer Absender';
+
+$labels['newitem']  = 'Neuer Eintrag';
+$labels['edititem']  = 'Eintrag bearbeiten';
+
+$labels['setdefault']  = 'Als Standard';
+$labels['language']  = 'Sprache';
+$labels['timezone']  = 'Zeitzone';
+$labels['pagesize']  = 'Einträge pro Seite';
+$labels['signature'] = 'Signatur';
+
+$labels['folder']  = 'Ordner';
+$labels['folders']  = 'Ordner';
+$labels['foldername']  = 'Ordnername';
+$labels['subscribed']  = 'Abonniert';
+$labels['create']      = 'Erstellen';
+$labels['createfolder']  = 'Neuen Ordner erstellen';
+$labels['deletefolder']  = 'Ordner löschen';
+$labels['managefolders']  = 'Ordner verwalten';
+
+$labels['sortby'] = 'Sortieren nach';
+$labels['sortasc']  = 'aufsteigend sortieren';
+$labels['sortdesc'] = 'absteigend sortieren';
+
+?>
\ No newline at end of file
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
new file mode 100644
index 0000000..1e5f0e5
--- /dev/null
+++ b/program/localization/de_CH/messages.inc
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/de_CH/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>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Login fehlgeschlagen';
+
+$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
+
+$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
+
+$messages['imaperror'] = 'Keine Verbindung zum IMAP Server';
+
+$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
+
+$messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
+
+$messages['mailboxempty'] = 'Ordner ist leer';
+
+$messages['loading'] = $messages['loadingdata'] = 'Daten werden geladen...';
+
+$messages['sendingmessage'] = 'Nachricht wird gesendet...';
+
+$messages['messagesent'] = 'Nachricht erfolgreich gesendet';
+
+$messages['successfullysaved'] = 'Erfolgreich gespeichert';
+
+$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
+
+$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
+
+$messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
+
+$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
+
+$messages['nocontactsfound'] = 'Keine Kontakte gefunden';
+
+$messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
+
+$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
+
+$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
+
+$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
+
+$messages['deletecontactconfirm']  = 'Wollen Sie die ausgewählten Kontakte wirklich löschen';
+
+$messages['deletefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich löschen?';
+
+$messages['purgefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich leeren?';
+
+$messages['formincomplete']    = 'Das Formular wurde nicht vollständig ausgefüllt';
+
+$messages['noemailwarning']    = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
+
+$messages['nonamewarning']     = 'Bitte geben Sie einen Namen ein';
+
+$messages['nopagesizewarning'] = 'Bitte geben Sie eine Einträge pro Seite ein';
+
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
+
+$messages['nosubjectwarning']  = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
+
+$messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
+
+$messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
+
+$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
+
+$messages['nocontactsreturned'] = 'Es wurden keine Kontakte gefunden';
+
+$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
+
+
+?>
\ No newline at end of file
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index fcda31a..a33ca99 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/de/labels.inc                                                |
+ | language/de_DE/labels.inc                                             |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
@@ -10,7 +10,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author:      Thomas Bruederli <roundcube@gmail.com>                   |
- | Corrections: Alexander Stiebing <ja.stiebing[NOSPAM]@web.de>          |
+ +-----------------------------------------------------------------------+
+ | de_DE translation: Stephan Diehl <info@sd-edv.de>                     |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -23,10 +24,10 @@
 $labels['username']  = 'Benutzername';
 $labels['password']  = 'Passwort';
 $labels['server']    = 'Server';
-$labels['login']     = 'Login';
+$labels['login']     = 'Anmelden';
 
 // taskbar // Aktionsleiste
-$labels['logout']   = 'Logout';
+$labels['logout']   = 'Abmelden';
 $labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
@@ -35,8 +36,8 @@
 $labels['inbox']  = 'Posteingang';
 $labels['sent']   = 'Gesendet';
 $labels['trash']  = 'Gelöscht';
-$labels['drafts'] = 'Vorlagen';
-$labels['junk']   = 'Junk';
+$labels['drafts'] = 'Entwürfe';
+$labels['junk']   = 'Spam';
 
 // message listing // Nachrichtenliste
 $labels['subject'] = 'Betreff';
@@ -61,7 +62,7 @@
 $labels['download'] = 'Download';
 
 $labels['filename'] = 'Dateiname';
-$labels['filesize'] = 'Dateigrösse';
+$labels['filesize'] = 'Dateigröße';
 
 $labels['preferhtml'] = 'HTML bevorzugen';
 $labels['htmlmessage'] = 'HTML Nachricht';
@@ -107,7 +108,7 @@
 
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
-$labels['purge'] = 'Aufr�umen';
+$labels['purge'] = 'Bereinigen';
 
 // message compose // Nachrichten erstellen
 $labels['compose']  = 'Neue Nachricht verfassen';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index fb13b41..5646e42 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/de/messages.inc                                              |
+ | language/de_DE/messages.inc                                           |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
@@ -11,6 +11,8 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
+ | de_DE translation: Stephan Diehl <info@sd-edv.de>                     |
+ +-----------------------------------------------------------------------+
 
  $Id$
 
@@ -18,7 +20,7 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Login fehlgeschlagen';
+$messages['loginfailed']  = 'Anmelden fehlgeschlagen';
 
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
 
diff --git a/program/localization/ee/labels.inc b/program/localization/ee/labels.inc
index deffc18..3c0bac2 100644
--- a/program/localization/ee/labels.inc
+++ b/program/localization/ee/labels.inc
@@ -121,9 +121,9 @@
 $labels['highest'] = 'Kõrgeim';
 
 $labels['nosubject']  = '(teema puudub)';
-
 $labels['showimages'] = 'Näita pilte';
-
+$labels['signature'] = 'Allkiri';
+$labels['charset']  = 'Märgistik';
 
 // address boook
 $labels['name']      = 'Näidatav nimi';
@@ -167,16 +167,29 @@
 $labels['pagesize']  = 'Ridu lehe kohta';
 
 
+$labels['folder']  = 'Kaust';
 $labels['folders']  = 'Kaustad';
 $labels['foldername']  = 'Kausta nimi';
 $labels['subscribed']  = 'Näitan';
 $labels['create']  = 'Loo';
 $labels['createfolder']  = 'Loo uus kaust';
 $labels['deletefolder']  = 'Kustuta kaust';
-$labels['managefolders']  = 'Manage folders';
+$labels['managefolders']  = 'Halda kaustu';
+$labels['compact'] = 'Tihenda';
+$labels['empty'] = 'Tühjenda';
+$labels['purge'] = 'Puhasta';
+$labels['quota'] = 'Ketta kasutus';
 
 $labels['sortby'] = 'Järjesta';
 $labels['sortasc']  = 'Järjesta kasvavalt';
 $labels['sortdesc'] = 'Järjesta kahanevalt';
 
-?>
+$labels['ldapsearch'] = 'LDAP kataloogi otsing';
+$labels['ldappublicsearchname']    = 'Kontakti nimi';
+$labels['ldappublicsearchtype'] = 'Täpne vaste ?';
+$labels['ldappublicserverselect'] = 'Vali server';
+$labels['ldappublicsearchfield'] = 'Otsi kohast';
+$labels['ldappublicsearchform'] = 'Otsi kontakti';
+$labels['ldappublicsearch'] = 'Otsi';
+
+?>
\ No newline at end of file
diff --git a/program/localization/ee/messages.inc b/program/localization/ee/messages.inc
index d1ad6b6..a7da684 100644
--- a/program/localization/ee/messages.inc
+++ b/program/localization/ee/messages.inc
@@ -76,5 +76,14 @@
 
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita ?';
 
+$messages['deletefolderconfirm']  = 'Soovid selle kataloogi kindlasti kustutada ?';
 
-?>
+$messages['notsentwarning'] = 'Kirja ei suudetud saata. Soovid selle ära visata ?';
+
+$messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
+
+$messages['nocontactsreturned'] = 'Ühtegi kontakti ei leitud';
+
+$messages['nosearchname'] = 'Palun sisesta kontakti nimi või e-maili aadress';
+
+?>
\ No newline at end of file
diff --git a/program/localization/es/labels.inc b/program/localization/es/labels.inc
index 55962c9..ca08349 100644
--- a/program/localization/es/labels.inc
+++ b/program/localization/es/labels.inc
@@ -2,16 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en/labels.inc                                                |
+ | language/es/labels.inc                                                |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David Grajal Blanco <dgrabla@gmail.com>                        |
+ | Author: David Grajal Blanco <dgrabla@gmail.com>                       |
+ |         http://david.grajal.net                                       |
  +-----------------------------------------------------------------------+
-
- $Id: labels.inc,v 1.1.1.1 2005/09/17
+ | Changelog:                                                            |
+ |  - 6/2/2006 Translations of new features and improvements)            |
+ |  - 17/9/2005 First release                                            |
+ +-----------------------------------------------------------------------+
+ 
+ $Id$
 
 */
 
@@ -63,7 +69,6 @@
 
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['htmlmessage'] = 'Mensaje HTML';
-$labels['prettydate'] = 'Fechas cortas';
 
 $labels['addtoaddressbook'] = 'Añadir a contactos';
 
@@ -90,7 +95,6 @@
 // toolbar buttons
 $labels['writenewmessage']  = 'Crear nuevo mensaje';
 $labels['replytomessage']   = 'Responder al mensaje';
-$labels['replytoallmessage'] = 'Responder a todos';
 $labels['forwardmessage']   = 'Reenviar mensaje';
 $labels['deletemessage']    = 'Move message to trash';
 $labels['printmessage']     = 'Imprimir este mensaje';
@@ -98,19 +102,30 @@
 $labels['nextmessages']     = 'Mostrar mensajes siguientes';
 $labels['backtolist']       = 'Volver a la lista de mensajes';
 
+$labels['viewsource']       = 'Mostrar código';
+
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
 $labels['unread'] = 'No leidos';
 
+$labels['compact'] = 'Compactar';
+$labels['empty'] = 'Vaciar';
+$labels['purge'] = 'Eliminar';
+
+$labels['quota'] = 'Uso de disco';
+
+
 // message compose
 $labels['compose']  = 'Escribir un mensaje';
 $labels['sendmessage']  = 'Enviar ahora el mensaje';
 $labels['addattachment']  = 'Añadir un fichero';
+$labels['charset']  = 'Codigo';
 
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['close']  = 'Cerrar';
+
 
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Bajísimo';
@@ -120,9 +135,12 @@
 
 $labels['showimages'] = 'Mostrar imágenes';
 
+$labels['nosubject']  = '(sin asunto)';
+$labels['showimages'] = 'Mostrar imágenes';
+
 
 // address boook
-$labels['name']      = 'Mostrar nombre';
+$labels['name']      = 'Nombre completo';
 $labels['firstname'] = 'Nombre';
 $labels['surname']   = 'Apellido';
 $labels['email']     = 'E-Mail';
@@ -139,6 +157,18 @@
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
 $labels['composeto']      = 'Redactar correo a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+
+// LDAP search
+$labels['ldapsearch'] = 'Búsqueda en el directorio LDAP';
+
+$labels['ldappublicsearchname']    = 'Nombre';
+$labels['ldappublicsearchtype'] = '¿Búsqueda exacta?';
+$labels['ldappublicserverselect'] = 'Elegir servidores';
+$labels['ldappublicsearchfield'] = 'Buscando';
+$labels['ldappublicsearchform'] = 'Buscar un contacto';
+$labels['ldappublicsearch'] = 'Buscar';
 
 
 // settings
@@ -160,6 +190,9 @@
 $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Filas por página';
 
+$labels['signature'] = 'Firma';
+
+$labels['folder']  = 'Carpeta';
 
 $labels['folders']  = 'Carpetas';
 $labels['foldername']  = 'Nombre de carpeta';
@@ -169,5 +202,11 @@
 $labels['deletefolder']  = 'Eliminar carpeta';
 $labels['managefolders']  = 'Gestionar carpetas';
 
+$labels['sortby'] = 'Ordenar por';
+$labels['sortasc']  = 'Orden ascendente';
+$labels['sortdesc'] = 'Orden descendente';
+
+$labels['prettydate']  = 'Formato de fecha';
+$labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
 
 ?>
diff --git a/program/localization/es/messages.inc b/program/localization/es/messages.inc
index 228ce7e..6d1912e 100644
--- a/program/localization/es/messages.inc
+++ b/program/localization/es/messages.inc
@@ -2,20 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en/messages.inc                                              |
+ | language/es/messages.inc                                              |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David Grajal <dgrabla@gmail.com>                              |
+ | Author: David Grajal Blanco <dgrabla@gmail.com>                       |
+ |         http://david.grajal.net                                       |
+ +-----------------------------------------------------------------------+
+ | Changelog:                                                            |
+ |  - 6/2/2006 Translations of new features and improvements             |
+ |  - 17/9/2005 First release                                            |
  +-----------------------------------------------------------------------+
 
- $Id: messages.inc,v 1.1.1.1 2005/09/17 
+ 
+ $Id$
 
 */
 
 $messages = array();
+
 
 $messages['loginfailed']  = 'Contraseña incorrecta';
 
@@ -31,7 +39,11 @@
 
 $messages['mailboxempty'] = 'El buzón esta vacio';
 
+$messages['loading'] = 'Cargando...';
+
 $messages['loadingdata'] = 'Cargando datos...';
+
+$messages['sendingmessage'] = 'Enviando mensaje...';
 
 $messages['messagesent'] = 'Mensaje enviado correctamente';
 
@@ -41,7 +53,7 @@
 
 $messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
 
-$messages['blockedimages'] = 'Para proteger su privacidad, las imágenes remotas han sido bloqueadas en este mensaje';
+$messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas han sido bloqueadas en este mensaje';
 
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
 
@@ -51,5 +63,36 @@
 
 $messages['errorsaving'] = 'Ocurrió un error mientras se guardaba';
 
+$messages['errormoving'] = 'No se ha podido mover el mensaje';
+
+$messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
+
+$messages['deletecontactconfirm']  = '¿Realmente quiere eliminar los contactos seleccionados?';
+
+$messages['deletefolderconfirm']  = '¿Esta seguro de que quiere eliminar esta carpeta?';
+
+$messages['purgefolderconfirm']  = '¿Esta seguro de que quiere eliminar todos los mensajes de esta carpeta?';
+
+$messages['formincomplete'] = 'No han sido rellenados todos los campos del formulario';
+
+$messages['noemailwarning'] = 'Por favor, introduzca un email válido';
+
+$messages['nonamewarning']  = 'Por favor, introduzca su nombre';
+
+$messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página';
+
+$messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario';
+
+$messages['nosubjectwarning']  = 'El campo "asunto" esta vacio. ¿Desea introducir el campo "asunto" al mensaje?';
+
+$messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
+
+$messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
+
+$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 email';
 
 ?>
diff --git a/program/localization/fi/labels.inc b/program/localization/fi/labels.inc
index 3ea0569..87dcc8b 100644
--- a/program/localization/fi/labels.inc
+++ b/program/localization/fi/labels.inc
@@ -105,10 +105,18 @@
 $labels['none'] = 'Ei mitään';
 $labels['unread'] = 'Lukemattomat';
 
+$labels['compact'] = 'Compact';
+$labels['empty'] = 'Empty';
+$labels['purge'] = 'Purge';
+
+$labels['quota'] = 'Levytila';
+
+
 // message compose
 $labels['compose']  = 'Viestin kirjoitus';
 $labels['sendmessage']  = 'Lähetä viesti';
 $labels['addattachment']  = 'Liitetiedosto';
+$labels['charset']  = 'Merkistö';
 
 $labels['attachments'] = 'Liitetiedostot';
 $labels['upload'] = 'Lisää';
@@ -120,6 +128,7 @@
 $labels['high']    = 'Korkea';
 $labels['highest'] = 'Korkein';
 
+$labels['nosubject']  = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 
 
@@ -138,11 +147,22 @@
 $labels['delete'] = 'Poista';
 
 $labels['newcontact']     = 'Luo uusi kontakti';
+$labels['addcontact']     = 'Lisää valittu kontakti osoitekirjaan';
 $labels['deletecontact']  = 'Poista valitut kontaktit';
 $labels['composeto']      = 'Kirjoita viesti kontaktille';
 $labels['contactsfromto'] = 'Kontaktit $from-$to/$count';
 $labels['print']          = 'Tulosta';
 $labels['export']         = 'Vie (export)';
+
+// LDAP search
+$labels['ldapsearch'] = 'LDAP hakemistohaku';
+
+$labels['ldappublicsearchname']    = 'Kontaktin nimi';
+$labels['ldappublicsearchtype'] = 'Tarkka osuma?';
+$labels['ldappublicserverselect'] = 'Valitse palvelimet';
+$labels['ldappublicsearchfield'] = 'Hakusana';
+$labels['ldappublicsearchform'] = 'Etsi kontaktia';
+$labels['ldappublicsearch'] = 'Hae';
 
 
 // settings
@@ -163,8 +183,9 @@
 $labels['language']  = 'Kieli';
 $labels['timezone']  = 'Aikavyöhyke';
 $labels['pagesize']  = 'Rivejä sivulla';
+$labels['signature'] = 'Allekirjoitus';
 
-
+$labels['folder']  = 'Kansio';
 $labels['folders']  = 'Kansiot';
 $labels['foldername']  = 'Kansion nimi';
 $labels['subscribed']  = 'Näytetään';
@@ -173,5 +194,8 @@
 $labels['deletefolder']  = 'Poista kansio';
 $labels['managefolders']  = 'Kansioiden ylläpito';
 
+$labels['sortby'] = 'Järjestä';
+$labels['sortasc']  = 'Järjestä nousevasti';
+$labels['sortdesc'] = 'Järjestä laskevasti';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/fi/messages.inc b/program/localization/fi/messages.inc
index e1d2196..935676e 100644
--- a/program/localization/fi/messages.inc
+++ b/program/localization/fi/messages.inc
@@ -32,7 +32,11 @@
 
 $messages['mailboxempty'] = 'Kansio on tyhjä';
 
-$messages['loadingdata'] = 'Ladataan...';
+$messages['loading'] = 'Ladataan...';
+
+$messages['loadingdata'] = 'Ladataan tietoja...';
+
+$messages['sendingmessage'] = 'Lähetetään viestiä...';
 
 $messages['messagesent'] = 'Viesti lähetetty';
 
@@ -56,5 +60,32 @@
 
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 
+$messages['deletecontactconfirm']  = 'Haluatko varmasti poistaa valitut kontaktit?';
+
+$messages['deletefolderconfirm']  = 'Haluatko varmasti poistaa kansion?';
+
+$messages['purgefolderconfirm']  = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+
+$messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
+
+$messages['noemailwarning'] = 'Anna sähköpostiosoite';
+
+$messages['nonamewarning']  = 'Anna nimi';
+
+$messages['nopagesizewarning'] = 'Anna sivukoko';
+
+$messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
+
+$messages['nosubjectwarning']  = '"Otsikko" -kenttä on tyhjä. Haluaisitko kirjoittaa viestillesi otsikon?';
+
+$messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
+
+$messages['notsentwarning'] = 'Viestiä ei lähetetty. Haluatko poistaa viestin?';
+
+$messages['noldapserver'] = 'Valitse ldap -palvelin';
+
+$messages['nocontactsreturned'] = 'Yhtään kontaktia ei löytynyt';
+
+$messages['nosearchname'] = 'Anna kontaktin nimi tai sähköpostiosoite';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/fr/labels.inc b/program/localization/fr/labels.inc
index 38f09fb..21eef24 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr/labels.inc
@@ -105,6 +105,13 @@
 $labels['none'] = 'Aucun';
 $labels['unread'] = 'Non lus';
 
+$labels['compact'] = 'Compresser';
+$labels['empty'] = 'Vider';
+$labels['purge'] = 'Purger';
+
+$labels['quota'] = 'Utilisation Disque';
+
+
 // message compose
 $labels['compose']  = 'Composer un nouveau message';
 $labels['sendmessage']  = 'Envoyer le message maintenant';
@@ -140,11 +147,15 @@
 $labels['delete'] = 'Supprimer';
 
 $labels['newcontact']     = 'Créer un nouveau contact';
+$labels['addcontact']     = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
 $labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
 $labels['composeto']      = 'Ecrire un message à';
 $labels['contactsfromto'] = 'Contacts $from à $to sur $count';
 $labels['print']          = 'Imprimer';
 $labels['export']         = 'Exporter';
+
+// LDAP search
+$labels['ldapsearch'] = 'Recherche dans répertoires LDAP';
 
 $labels['ldappublicsearchname']    = 'Nom du contact';
 $labels['ldappublicsearchtype'] = 'Correspondance exacte ?';
@@ -152,6 +163,7 @@
 $labels['ldappublicsearchfield'] = 'Recherche sur';
 $labels['ldappublicsearchform'] = 'Chercher un contact';
 $labels['ldappublicsearch'] = 'Recherche';
+
 
 // settings
 $labels['settingsfor']  = 'Paramètres pour';
@@ -173,7 +185,7 @@
 $labels['pagesize']  = 'Nombre de lignes par page';
 $labels['signature'] = 'Signature';
 
-
+$labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossiers';
 $labels['foldername']  = 'Nom du dossier';
 $labels['subscribed']  = 'Abonné';
diff --git a/program/localization/fr/messages.inc b/program/localization/fr/messages.inc
index 3e522ef..16b93a7 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr/messages.inc
@@ -60,7 +60,11 @@
 
 $messages['errordeleting'] = 'Impossible d\'effacer le message';
 
+$messages['deletecontactconfirm']  = 'Voulez-vous vraiment effacer les contacts sélectionnés ?';
+
 $messages['deletefolderconfirm']  = 'Voulez-vous vraiment effacer ce dossier ?';
+
+$messages['purgefolderconfirm']  = 'Voulez-vous vraiment effacer tous les messages dans ce dossier ?';
 
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
 
@@ -84,4 +88,4 @@
 
 $messages['nosearchname'] = 'Entrez un nom ou une adresse e-Mail de contact';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 4386377..6197dc2 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -31,7 +31,8 @@
 	'cz'    => 'Czech',
  	'ca'    => 'Català',
 	'da'    => 'Dansk',
- 	'de_DE' => 'Deutsch',
+ 	'de_DE' => 'Deutsch (Deutsch)',
+ 	'de_CH' => 'Deutsch (Schweiz)',
  	'es'    => 'Español',
  	'ee'    => 'Estonian',
 	'eu'    => 'Euskara',
@@ -41,7 +42,7 @@
 	'hr'	=> 'Hrvatski',
 	'hu'    => 'Hungarian',
 	'it'    => 'Italiano',
-	'ja'    => 'Japanese',
+	'ja'    => 'Japanese (日本語)',
 	'kr'    => 'Korean',
 	'lv'    => 'Latvian',
 	'nl_NL' => 'Nederlands',
@@ -63,6 +64,7 @@
 );
 
 $rcube_language_aliases = array(
+	'et_EE' => 'ee',
 	'bs' => 'bs_BA',
 	'de' => 'de_DE',
 	'en' => 'en_US',
@@ -73,4 +75,5 @@
 
 $rcube_charsets = array();
 
+
 ?>
\ No newline at end of file
diff --git a/program/localization/ja/labels.inc b/program/localization/ja/labels.inc
index 06d41e1..b091af5 100644
--- a/program/localization/ja/labels.inc
+++ b/program/localization/ja/labels.inc
@@ -91,6 +91,7 @@
 // toolbar buttons
 $labels['writenewmessage']  = '新規メッセージを作成する';
 $labels['replytomessage']   = 'メッセージを返信する';
+$labels['replytoallmessage'] = '送信者とすべての受信者に返信する';
 $labels['forwardmessage']   = 'メッセージを転送する';
 $labels['deletemessage']    = 'ごみ箱にメッセージを移動する';
 $labels['printmessage']     = 'このメッセージを印刷する';
@@ -104,10 +105,18 @@
 $labels['none'] = 'なし';
 $labels['unread'] = '未読';
 
+$labels['compact'] = 'コンパクト';
+$labels['empty'] = '空';
+$labels['purge'] = '破棄';
+
+$labels['quota'] = 'ディスク使用量';
+
+
 // message compose
 $labels['compose']  = 'メッセージを作成する';
 $labels['sendmessage']  = 'メッセージを今すぐ送信する';
 $labels['addattachment']  = 'ファイルを添付する';
+$labels['charset']  = '文字エンコード';
 
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
@@ -119,6 +128,7 @@
 $labels['high']    = '高い';
 $labels['highest'] = '最高';
 
+$labels['nosubject']  = '(件名なし)';
 $labels['showimages'] = '画像を表示する';
 
 
@@ -128,8 +138,8 @@
 $labels['surname']   = '苗字';
 $labels['email']     = '電子メールアドレス';
 
-$labels['addcontact'] = '新規連絡簿を追加する';
-$labels['editcontact'] = '連絡簿を編集する';
+$labels['addcontact'] = '新規連絡先を追加する';
+$labels['editcontact'] = '連絡先を編集する';
 
 $labels['edit']   = '編集する';
 $labels['cancel'] = '取り消し';
@@ -137,11 +147,22 @@
 $labels['delete'] = '削除する';
 
 $labels['newcontact']     = '新規連絡カードを作成する';
-$labels['deletecontact']  = '選択した連絡簿を削除する';
+$labels['addcontact']     = '選択した連絡先をアドレス帳に追加する';
+$labels['deletecontact']  = '選択した連絡先を削除する';
 $labels['composeto']      = '次にメールを作成する:';
-$labels['contactsfromto'] = '連絡簿 $from から $to (合計: $count)';
+$labels['contactsfromto'] = '連絡先 $from から $to (合計: $count)';
 $labels['print']          = '印刷する';
 $labels['export']         = 'エクスポートする';
+
+// LDAP search
+$labels['ldapsearch'] = 'LDAP ディレクトリ検索';
+
+$labels['ldappublicsearchname']    = '連絡先名';
+$labels['ldappublicsearchtype'] = '正確に一致?';
+$labels['ldappublicserverselect'] = 'サーバー選択';
+$labels['ldappublicsearchfield'] = 'Search on';
+$labels['ldappublicsearchform'] = 'Look for a contact';
+$labels['ldappublicsearch'] = '検索する';
 
 
 // settings
@@ -161,9 +182,10 @@
 $labels['setdefault']  = 'デフォルトの設定';
 $labels['language']  = '言語';
 $labels['timezone']  = 'タイムゾーン';
-$labels['pagesize']  = 'ページ毎の行数';
+$labels['pagesize']  = 'ページ辺りの行数';
+$labels['signature'] = '署名';
 
-
+$labels['folder']  = 'フォルダー';
 $labels['folders']  = 'フォルダー一覧';
 $labels['foldername']  = 'フォルダー名';
 $labels['subscribed']  = '購読済';
diff --git a/program/localization/ja/messages.inc b/program/localization/ja/messages.inc
index bfc752e..184a059 100644
--- a/program/localization/ja/messages.inc
+++ b/program/localization/ja/messages.inc
@@ -32,7 +32,11 @@
 
 $messages['mailboxempty'] = 'メールボックスは空です。';
 
+$messages['loading'] = '読み込み中...';
+
 $messages['loadingdata'] = 'データを読み込み中です...';
+
+$messages['sendingmessage'] = 'メッセージの送信中です...';
 
 $messages['messagesent'] = 'メッセージの送信に成功しました。';
 
@@ -40,13 +44,13 @@
 
 $messages['addedsuccessfully'] = '連絡先をアドレス帳への追加に成功しました。';
 
-$messages['contactexists'] = 'この電子メールアドレスは連絡簿に既に存在します。';
+$messages['contactexists'] = 'この電子メールアドレスはアドレス帳に既に存在します。';
 
 $messages['blockedimages'] = 'プライバシを保護するために、このメッセージのリモート画像はブロックされました。';
 
 $messages['encryptedmessage'] = 'これは暗号化されたメッセージで表示することができません。ごめんなさい!';
 
-$messages['nocontactsfound'] = '連絡簿が見つかりません。';
+$messages['nocontactsfound'] = '連絡先が見つかりません。';
 
 $messages['sendingfailed'] = 'メッセージの送信に失敗しました。';
 
@@ -56,5 +60,32 @@
 
 $messages['errordeleting'] = 'メッセージの削除ができません。';
 
+$messages['deletecontactconfirm']  = '本当に選択した連絡先を削除しますか?';
+
+$messages['deletefolderconfirm']  = '本当にこのフォルダーを削除しますか?';
+
+$messages['purgefolderconfirm']  = '本当にこのフォルダーのすべてのメッセージを削除しますか?';
+
+$messages['formincomplete'] = 'フォームは完全に埋められていません。';
+
+$messages['noemailwarning'] = '有効な電子メールアドレスを入力してください';
+
+$messages['nonamewarning']  = '名前を入力してください';
+
+$messages['nopagesizewarning'] = 'ページサイズを入力してください';
+
+$messages['norecipientwarning'] = '少なくとも 1 つ受信者を入力してください';
+
+$messages['nosubjectwarning']  = '項目「件名」が空です。今入力しますか?';
+
+$messages['nobodywarning'] = 'テキストの無いメッセージを送信しますか?';
+
+$messages['notsentwarning'] = 'メッセージは送信されませんでした。メッセージを破棄したいですか?';
+
+$messages['noldapserver'] = '検索する LDAP サーバーを選択してください';
+
+$messages['nocontactsreturned'] = '連絡先が見つかりません';
+
+$messages['nosearchname'] = '連絡先名か電子メールアドレスを入力してください';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/lv/labels.inc b/program/localization/lv/labels.inc
index fd2c500..943c52d 100644
--- a/program/localization/lv/labels.inc
+++ b/program/localization/lv/labels.inc
@@ -64,7 +64,7 @@
 
 $labels['preferhtml'] = 'Dot priekšroku HTML';
 $labels['htmlmessage'] = 'HTML vēstule';
-$labels['prettydate'] = 'Skaists datums';
+$labels['prettydate'] = '"Skaists" datums';
 
 $labels['addtoaddressbook'] = 'Pievienot adrešu grāmatai';
 
@@ -91,22 +91,32 @@
 // toolbar buttons
 $labels['writenewmessage']  = 'Rakstīt jaunu vēstuli';
 $labels['replytomessage']   = 'Atbildēt uz vēstuli';
+$labels['replytoallmessage'] = 'Atbildēt sūtītājam un visiem saņēmējiem';
 $labels['forwardmessage']   = 'Pārsūtīt vēstuli';
 $labels['deletemessage']    = 'Pārvietot vēstuli uz miskasti';
 $labels['printmessage']     = 'Izdrukāt šo vēstuli';
 $labels['previousmessages'] = 'Parādīt iepriekšējo vēstuļu kopu';
 $labels['nextmessages']     = 'Parādīt nākamo vēstuļu kopu';
 $labels['backtolist']       = 'Atpakaļ uz vēstuļu sarakstu';
+$labels['viewsource']       = 'Rādīt pirmtekstu';
 
 $labels['select'] = 'Iezīmēt';
 $labels['all'] = 'Visas';
 $labels['none'] = 'Nevienu';
 $labels['unread'] = 'Nelasītās';
 
+$labels['compact'] = 'Saspiest';
+$labels['empty'] = 'Iztukšot';
+$labels['purge'] = 'Iztīrīt';
+
+$labels['quota'] = 'Kvota';
+
+
 // message compose
 $labels['compose']  = 'Rakstīt vēstuli';
 $labels['sendmessage']  = 'Sūtīt vēstuli';
 $labels['addattachment']  = 'Pievienot failu';
+$labels['charset']  = 'Rakstzīmju kopa';
 
 $labels['attachments'] = 'Pielikumi';
 $labels['upload'] = 'Augšupielādēt';
@@ -118,6 +128,7 @@
 $labels['high']    = 'Augsta';
 $labels['highest'] = 'Augstākā';
 
+$labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
 
 
@@ -136,9 +147,22 @@
 $labels['delete'] = 'Dzēst';
 
 $labels['newcontact']     = 'Izveidot jaunu ierakstu adrešu grāmatā';
+$labels['addcontact']     = 'Pievienot iezīmēto ierakstu adrešu grāmatai';
 $labels['deletecontact']  = 'Dzēst iezīmētos ierakstus';
 $labels['composeto']      = 'Rakstīt vēstuli';
 $labels['contactsfromto'] = 'Ieraksti $from līdz $to no $count';
+$labels['print']          = 'Drukāt';
+$labels['export']         = 'Eksportēt';
+
+// LDAP search
+$labels['ldapsearch'] = 'Meklēšana LDAP direktorijā';
+
+$labels['ldappublicsearchname']    = 'Kontaktpersonas vārds';
+$labels['ldappublicsearchtype'] = 'Precīzi sakrist?';
+$labels['ldappublicserverselect'] = 'Izvēlieties serveri';
+$labels['ldappublicsearchfield'] = 'Meklēt pēc';
+$labels['ldappublicsearchform'] = 'Meklēt kontaktpersonu';
+$labels['ldappublicsearch'] = 'Meklēt';
 
 
 // settings
@@ -159,8 +183,9 @@
 $labels['language']  = 'Valoda';
 $labels['timezone']  = 'Laika zona';
 $labels['pagesize']  = 'Rindas lapā';
+$labels['signature'] = 'Paraksts';
 
-
+$labels['folder']  = 'Mape';
 $labels['folders']  = 'Mapes';
 $labels['foldername']  = 'Mapes nosaukums';
 $labels['subscribed']  = 'Abonētās';
@@ -169,5 +194,8 @@
 $labels['deletefolder']  = 'Dzēst mapi';
 $labels['managefolders']  = 'Rediģēt mapes';
 
+$labels['sortby'] = 'Kārtot pēc';
+$labels['sortasc']  = 'Kārtot augošā secībā';
+$labels['sortdesc'] = 'Kārtot dilstošā secībā';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/lv/messages.inc b/program/localization/lv/messages.inc
index 1e43dd0..ad07bef 100644
--- a/program/localization/lv/messages.inc
+++ b/program/localization/lv/messages.inc
@@ -32,7 +32,11 @@
 
 $messages['mailboxempty'] = 'Pastkaste tukša';
 
+$messages['loading'] = 'Notiek ielāde...';
+
 $messages['loadingdata'] = 'Tiek ielādēti dati...';
+
+$messages['sendingmessage'] = 'Tiek sūtīta vēstule...';
 
 $messages['messagesent'] = 'Vēstule nosūtīta veiksmīgi';
 
@@ -50,7 +54,38 @@
 
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
 
-$messages['errorsaving'] = 'Saglabājot notikusi kļūme';
+$messages['errorsaving'] = 'Saglabājot vēstuli notikusi kļūme, vēstule netika saglabāta';
 
+$messages['errormoving'] = 'Vēstule netika pārvietota';
 
-?>
\ No newline at end of file
+$messages['errordeleting'] = 'Vēstule netika dzēsta';
+
+$messages['deletecontactconfirm']  = 'Vai tiešām vēlaties dzēst iezīmēto(ās) kontaktpersonas?';
+
+$messages['deletefolderconfirm']  = 'Vai tiešām vēlaties dzēst šo mapi?';
+
+$messages['purgefolderconfirm']  = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
+
+$messages['formincomplete'] = 'Formulārs nav pilnībā aizpildīts';
+
+$messages['noemailwarning'] = 'Lūdzu ievadiet pareizu e-pasta adresi';
+
+$messages['nonamewarning']  = 'Lūdzu ievadiet vārdu';
+
+$messages['nopagesizewarning'] = 'Lūdzu ievadiet lapas izmēru';
+
+$messages['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
+
+$messages['nosubjectwarning']  = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
+
+$messages['nobodywarning'] = 'Sūtīt vēstuli bez satura teksta?';
+
+$messages['notsentwarning'] = 'Vēstule netika nosūtīta. Vai vēlaties atmest savu vēstuli?';
+
+$messages['noldapserver'] = 'Lūdzu izvēlaties LDAP serveri';
+
+$messages['nocontactsreturned'] = 'Neviena kontaktpersona netika atrasta';
+
+$messages['nosearchname'] = 'Lūdzu ievadiet kontaktpersonas vārdu vai e-pasta adresi';
+
+?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index b8158bd..3055d28 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/nl/labels.inc                                                |
+ | language/nl_NL/labels.inc                                             |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
@@ -10,6 +10,7 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Jasper Slits <jaspersl@xs4all.nl>                             |
+ | Updates: Dennis Heeren <dennis.heeren@gmail.com>                      |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -22,51 +23,51 @@
 $labels['username']  = 'Gebruikersnaam';
 $labels['password']  = 'Wachtwoord';
 $labels['server']    = 'Server';
-$labels['login']     = 'Log in';
+$labels['login']     = 'Aanmelden';
 
 // taskbar
-$labels['logout']   = 'Log uit';
-$labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Persoonlijke Instellingen';
-$labels['addressbook'] = 'Adres boek';
+$labels['logout']   = 'Afmelden';
+$labels['mail']     = 'Berichten';
+$labels['settings'] = 'Instellingen';
+$labels['addressbook'] = 'Contactpersonen';
 
 // mailbox names
-$labels['inbox']  = 'Inbox';
-$labels['sent']   = 'Sent';
-$labels['trash']  = 'Trash';
-$labels['drafts'] = 'Drafts';
-$labels['junk']   = 'Junk';
+$labels['inbox']  = 'Postvak IN';
+$labels['sent']   = 'Verzonden berichten';
+$labels['trash']  = 'Prullenbak';
+$labels['drafts'] = 'Concepten';
+$labels['junk']   = 'Spam';
 
 // message listing
 $labels['subject'] = 'Onderwerp';
-$labels['from']    = 'Afzender';
-$labels['to']      = 'Ontvangen';
-$labels['cc']      = 'Copy';
+$labels['from']    = 'Van';
+$labels['to']      = 'Aan';
+$labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
-$labels['replyto'] = 'Reply-To';
+$labels['replyto'] = 'Antwoorden aan';
 $labels['date']    = 'Datum';
 $labels['size']    = 'Grootte';
-$labels['priority'] = 'Prioriiteit';
+$labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 
 // aliases
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Mappen';
-$labels['messagesfromto'] = 'Berichten $from tot $to van $count';
+$labels['messagesfromto'] = 'Berichten $from - $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
 
 $labels['moveto']   = 'verplaats naar...';
-$labels['download'] = 'download';
+$labels['download'] = 'downloaden';
 
 $labels['filename'] = 'Bestandsnaam';
 $labels['filesize'] = 'Bestandsgrootte';
 
-$labels['preferhtml'] = 'HTML voorkeur';
-$labels['htmlmessage'] = 'HTML Bericht';
-$labels['prettydate'] = 'Uitgebreide datum';
+$labels['preferhtml'] = 'Gebruik HTML-opmaak';
+$labels['htmlmessage'] = 'HTML-bericht';
+$labels['prettydate'] = 'Uitgebreide datumweergave';
 
-$labels['addtoaddressbook'] = 'Toevoegen aan adresboek';
+$labels['addtoaddressbook'] = 'Voeg toe aan lijst met contactpersonen';
 
 // weekdays short
 $labels['sun'] = 'Zo';
@@ -89,30 +90,29 @@
 $labels['today'] = 'Vandaag';
 
 // toolbar buttons
-$labels['writenewmessage']  = 'Schrijf een nieuw bericht';
-$labels['replytomessage']   = 'Beantwoord het bericht';
-$labels['replytoallmessage'] = 'Beantwoord allen';
-$labels['forwardmessage']   = 'Stuur bericht door';
-$labels['deletemessage']    = 'Verplaats bericht naar prullenbak';
-$labels['printmessage']     = 'Print dit bericht';
-$labels['previousmessages'] = 'Toon vorige lijst met berichten';
-$labels['nextmessages']     = 'Toon volgende lijst met berichten';
-$labels['backtolist']       = 'Terug naar berichtoverzicht';
-$labels['viewsource']       = 'Bron bekijken';
+$labels['writenewmessage']  = 'Nieuw bericht';
+$labels['replytomessage']   = 'Beantwoorden';
+$labels['forwardmessage']   = 'Doorsturen';
+$labels['deletemessage']    = 'Dit bericht verwijderen';
+$labels['printmessage']     = 'Afdrukken';
+$labels['previousmessages'] = 'Vorige berichten';
+$labels['nextmessages']     = 'Volgende berichten';
+$labels['backtolist']       = 'Terug naar berichtenlijst';
+$labels['viewsource']       = 'Broncode bericht weergeven';
 
-$labels['select'] = 'Selecteer';
-$labels['all'] = 'Alle';
+$labels['select'] = 'Selecteren';
+$labels['all'] = 'Alles';
 $labels['none'] = 'Geen';
 $labels['unread'] = 'Ongelezen';
 
 // message compose
-$labels['compose']  = 'Creeer een nieuw message';
-$labels['sendmessage']  = 'Verstuur het bericht nu';
-$labels['addattachment']  = 'Voeg een bijlage toe';
+$labels['compose']  = 'Nieuw bericht opstellen';
+$labels['sendmessage']  = 'Verzenden';
+$labels['addattachment']  = 'Bestand toevoegen als bijlage';
 
-$labels['attachments'] = 'Bijlages';
+$labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
-$labels['close']  = 'Sluit';
+$labels['close']  = 'Sluiten';
 
 $labels['low']     = 'Laag';
 $labels['lowest']  = 'Laagste';
@@ -120,30 +120,29 @@
 $labels['high']    = 'Hoog';
 $labels['highest'] = 'Hoogste';
 
-$labels['showimages'] = 'Afbeeldingen weergeven';
+$labels['showimages'] = 'Toon afbeeldingen';
 
 
 // address boook
-$labels['name']      = 'Weergave naam';
+$labels['name']      = 'Naam';
 $labels['firstname'] = 'Voornaam';
 $labels['surname']   = 'Achternaam';
-$labels['email']     = 'E-Mail';
+$labels['email']     = 'E-mailadres';
 
-$labels['addcontact'] = 'Nieuw contactpersoon toevoegen';
-$labels['editcontact'] = 'Wijzig contactpersoon';
+$labels['addcontact'] = 'Contactpersoon toevoegen';
+$labels['editcontact'] = 'Contactpersoon bewerken';
 
-$labels['edit']   = 'Wijzig';
+$labels['edit']   = 'Bewerken';
 $labels['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
-$labels['delete'] = 'Verwijder';
+$labels['delete'] = 'Verwijderen';
 
-$labels['newcontact']     = 'Creeer nieuwe contactpersoon';
+$labels['newcontact']     = 'Contactpersoon toevoegen';
 $labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
-$labels['composeto']      = 'Verstuur bericht aan';
-$labels['contactsfromto'] = 'Contactpersonen $from tot $to van $count';
-
-$labels['print'] = 'Print';
-$labels['export'] = 'Exporteer';
+$labels['composeto']      = 'Mail sturen aan';
+$labels['contactsfromto'] = 'Contactpersonen $from - $to van $count';
+$labels['print']          = 'Afdrukken';
+$labels['export']         = 'Exporteren';
 
 
 // settings
@@ -151,31 +150,50 @@
 
 $labels['preferences']  = 'Voorkeuren';
 $labels['userpreferences']  = 'Gebruikersvoorkeuren';
-$labels['editpreferences']  = 'Wijzig gebruikersvoorkeur';
+$labels['editpreferences']  = 'Gebruikersvoorkeuren bewerken';
 
-$labels['identities']  = 'Identiteit';
-$labels['manageidentities']  = 'Beheer identiteiten voor dit account';
+$labels['identities']  = 'Identiteiten';
+$labels['manageidentities']  = 'Beheer de identiteiten voor deze gebruiker';
 $labels['newidentity']  = 'Nieuwe identiteit';
 
-$labels['newitem']  = 'Nieuw item';
-$labels['edititem']  = 'Wijzig item';
+$labels['newitem']  = 'Nieuw';
+$labels['edititem']  = 'Bewerken';
 
-$labels['setdefault']  = 'Standaard instelling';
+$labels['setdefault']  = 'Als standaard instellen';
 $labels['language']  = 'Taal';
-$labels['timezone']  = 'Tijd zone';
+$labels['timezone']  = 'Tijdzone';
 $labels['pagesize']  = 'Berichten per pagina';
 
-
+$labels['folder']  = 'Map';
 $labels['folders']  = 'Mappen';
-$labels['foldername']  = 'Map naam';
-$labels['subscribed']  = 'Subscribed';
-$labels['create']  = 'Creeren';
-$labels['createfolder']  = 'Maak nieuwe map';
-$labels['deletefolder']  = 'Verwijder map';
-$labels['managefolders']  = 'Beheer mappen';
+$labels['foldername']  = 'Naam';
+$labels['subscribed']  = 'Gebruiken';
+$labels['create']  = 'Aanmaken';
+$labels['createfolder']  = 'Nieuwe map aanmaken';
+$labels['deletefolder']  = 'Map verwijderen';
+$labels['managefolders']  = 'Mappen beheren';
 
-$labels['sortby']   = 'Sorteer op';
-$labels['sortdesc'] = 'Sorteer (z-a)';
-$labels['sortasc']  = 'Sorteer (a-z)';
+// new in 0.1b
+$labels['replytoallmessage'] = 'Allen beantwoorden';
+
+$labels['compact'] = 'Comprimeren';
+$labels['empty'] = 'Legen';
+$labels['purge'] = 'Opruimen';
+
+$labels['sortby']   = 'Sorteren op';
+$labels['sortdesc'] = 'Aflopend sorteren';
+$labels['sortasc']  = 'Oplopend sorteren';
+
+$labels['nosubject']  = '(geen onderwerp)';
+$labels['signature'] = 'Handtekening';
+$labels['charset']  = 'Karakterset';
+
+$labels['ldapsearch'] = 'LDAP opzoeking';
+$labels['ldappublicsearchname'] = 'Naam contactpersoon';
+$labels['ldappublicsearchtype'] = 'Exact zoeken?';
+$labels['ldappublicserverselect'] = 'Kies een server';
+$labels['ldappublicsearchfield'] = 'Zoeken op';
+$labels['ldappublicsearchform'] = 'Zoek een contactpersoon';
+$labels['ldappublicsearch'] = 'Zoeken';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 31b2348..158ca68 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/nl/messages.inc                                              |
+ | language/nl_NL/messages.inc                                           |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
@@ -10,6 +10,7 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Jasper Slits <jaspersl@xs4all.nl>                             |
+ | Updates: Dennis Heeren <dennis.heeren@gmail.com>                      |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -18,39 +19,74 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Login mislukt';
+$messages['loginfailed']  = 'Aanmelden mislukt...';
 
-$messages['cookiesdisabled'] = 'Je browser accepteert geen cookies';
+$messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies...';
 
-$messages['sessionerror'] = 'Je sessie is ongeldig of verlopen';
+$messages['sessionerror'] = 'Sessie is reeds beëindigd of is ongeldig...';
 
-$messages['imaperror'] = 'Verbinding met IMAP-server mislukt';
+$messages['imaperror'] = 'Kon geen verbinding maken met de IMAP server...';
 
-$messages['nomessagesfound'] = 'Geen berichten gevonden in Postvak IN';
+$messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
 
-$messages['loggedout'] = 'Je bent succesvol uitgelogd. Tot ziens!';
+$messages['loggedout'] = 'U bent nu afgemeld. Tot ziens!';
 
-$messages['mailboxempty'] = 'Postbak is leeg';
+$messages['mailboxempty'] = 'Mailbox is leeg...';
 
-$messages['loadingdata'] = 'Ophalen gegevens...';
+$messages['loadingdata'] = 'Bezig met gegevens ophalen...';
 
-$messages['messagesent'] = 'Bericht succesvol verzonden';
+$messages['messagesent'] = 'Het bericht is verzonden...';
 
-$messages['successfullysaved'] = 'Succesvol opgeslagen';
+$messages['successfullysaved'] = 'Succesvol opgeslagen...';
 
-$messages['addedsuccessfully'] = 'Contactpersoon succesvol toegevoegd aan het adresboek';
+$messages['addedsuccessfully'] = 'Contactpersoon is toegevoegd...';
 
-$messages['contactexists'] = 'Een contactpersoon met dit e-mail adres bestaat al';
+$messages['contactexists'] = 'Er bestaat reeds een contactpersoon met dit e-mailadres...';
 
-$messages['blockedimages'] = 'Om je privacy te beschermen zijn externe afbeeldingen geblokkeerd in dit bericht.';
+$messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond...';
 
-$messages['encryptedmessage'] = 'Dit bericht is versleuteld en kan niet worden weergegeven. Sorry!';
+$messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry...';
 
-$messages['nocontactsfound'] = 'Geen contactpersonen gevonden';
+$messages['nocontactsfound'] = 'Geen contactpersonen gevonden...';
 
-$messages['sendingfailed'] = 'Versturen van het bericht is mislukt';
+$messages['sendingfailed'] = 'Kon het bericht niet versturen...';
 
-$messages['errorsaving'] = 'Er is een fout opgetreden bij het opslaan';
+$messages['errorsaving'] = 'Er is een fout opgetreden bij het opslaan van het bericht...';
 
+$messages['errormoving'] = 'Kon het bericht niet verplaatsen...';
+
+$messages['errordeleting'] = 'Kon het bericht niet verwijderen...';
+
+$messages['loading'] = 'Bezig met ophalen gegevens...';
+
+$messages['sendingmessage'] = 'Bericht wordt verstuurd...';
+
+$messages['errormoving']    = 'Kon het bericht niet verplaatsen...';
+
+$messages['errordeleting']  = 'Kon het bericht niet verwijderen...';
+
+$messages['noemailwarning'] = 'Geef een geldig e-mailadres op...';
+
+$messages['nonamewarning']  = 'Geef een naam op...';
+
+$messages['nopagesizewarning'] = 'Geef een paginaformaat op...';
+
+$messages['formincomplete']    = 'Het formulier is niet volledig ingevuld...';
+
+$messages['norecipientwarning'] = 'Geef minstens één bestemmeling op...';
+
+$messages['nosubjectwarning']  = 'Geen onderwerp opgegeven. Wenst u alsnog een onderwerp te geven?';
+
+$messages['nobodywarning'] = 'Wilt u dit lege bericht versturen?';
+
+$messages['deletefolderconfirm']  = 'Weet u zeker dat u deze map wilt verwijderen?';
+
+$messages['notsentwarning'] = 'Het bericht is niet verzonden. Wilt u het bericht verwijderen?';
+
+$messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden...';
+
+$messages['nocontactsreturned'] = 'Geen contactpersonen gevonden';
+
+$messages['nosearchname'] = 'Geen een contacpersoon of e-mailadres op...';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index c310a3e..33ed16f 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en/labels.inc                                                |
+ | language/pl/labels.inc                                                |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
@@ -53,7 +53,7 @@
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Foldery';
-$labels['messagesfromto'] = 'Wiadmość od $from do $to of $count';
+$labels['messagesfromto'] = 'Wiadmość od $from do $to z $count';
 $labels['messagenrof'] = 'Wiadmość $nr z $count';
 
 $labels['moveto']   = 'Przenieś do...';
@@ -90,9 +90,10 @@
 
 // toolbar buttons
 $labels['writenewmessage']  = 'Utwórz nową wiadmomość';
-$labels['replytomessage']   = 'Odpowiedz';
-$labels['forwardmessage']   = 'Prześlij';
-$labels['deletemessage']    = 'Usuń do kosza';
+$labels['replytomessage']   = 'Odpowiedz nadawcy';
+$labels['replytoallmessage'] = 'Odpowiedz wszystkim';
+$labels['forwardmessage']   = 'Prześlij dalej';
+$labels['deletemessage']    = 'Usuń';
 $labels['printmessage']     = 'Drukuj';
 $labels['previousmessages'] = 'Pokaż poprzednią';
 $labels['nextmessages']     = 'Pokaż następną';
@@ -100,14 +101,21 @@
 $labels['viewsource']       = 'Pokaż źródło';
 
 $labels['select'] = 'Wybierz';
-$labels['all'] = 'Wszystkie';
-$labels['none'] = 'Brak';
-$labels['unread'] = 'Nieprzeczytane';
+$labels['all'] = 'Zaznacz wszystkie';
+$labels['none'] = 'Odznacz';
+$labels['unread'] = 'Zaznacz nieprzeczytane';
+
+$labels['compact'] = 'Kompaktuj';
+$labels['empty'] = 'Pusty';
+$labels['purge'] = 'Oczyść';
+
+$labels['quota'] = 'Użyta Przestrzeń';
 
 // message compose
 $labels['compose']  = 'Utwórz wiadomość';
 $labels['sendmessage']  = 'Wyślij teraz';
 $labels['addattachment']  = 'Dołącz plik';
+$labels['charset']  = 'Kodowanie znaków';
 
 $labels['attachments'] = 'Załączniki';
 $labels['upload'] = 'Wgraj';
@@ -119,8 +127,8 @@
 $labels['high']    = 'Wysoki';
 $labels['highest'] = 'Bardzo wysoki';
 
+$labels['nosubject']  = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
-
 
 // address boook
 $labels['name']      = 'Nazwa';
@@ -137,11 +145,22 @@
 $labels['delete'] = 'Kasuj';
 
 $labels['newcontact']     = 'Dodaj nowy kontakt';
+$labels['addcontact']     = 'Dodaj znaznaczony kontakt do książki adresowej';
 $labels['deletecontact']  = 'Usuń zaznaczone kontakty';
 $labels['composeto']      = 'Stwórz wiadomość dla';
-$labels['contactsfromto'] = 'Kontakt od $from do $to of $count';
+$labels['contactsfromto'] = 'Kontakt od $from do $to z $count';
 $labels['print']          = 'Drukuj';
 $labels['export']         = 'Eksportuj';
+
+// LDAP search
+$labels['ldapsearch'] = 'Wyszukiwanie w katalogu LDAP';
+
+$labels['ldappublicsearchname']    = 'Nazwa kontaktu';
+$labels['ldappublicsearchtype'] = 'Dokładnie pasujący?';
+$labels['ldappublicserverselect'] = 'Wybierz serwery';
+$labels['ldappublicsearchfield'] = 'Szukaj w ';
+$labels['ldappublicsearchform'] = 'Szukaj kontaktu';
+$labels['ldappublicsearch'] = 'Szukaj';
 
 // settings
 $labels['settingsfor']  = 'Ustawienia dla';
@@ -161,7 +180,7 @@
 $labels['language']  = 'Język';
 $labels['timezone']  = 'Strefy czasu';
 $labels['pagesize']  = 'wierszy na stronie';
-
+$labels['signature'] = 'Podpis';
 
 $labels['folders']  = 'Foldery';
 $labels['foldername']  = 'Nazwa folderu';
@@ -171,5 +190,8 @@
 $labels['deletefolder']  = 'Usuń folder';
 $labels['managefolders']  = 'Zarządzaj folderami';
 
+$labels['sortby'] = 'Sortuj wg.';
+$labels['sortasc']  = 'Rosnąco';
+$labels['sortdesc'] = 'Malejąco';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index cb3450e..6892e94 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -9,11 +9,8 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
  +-----------------------------------------------------------------------+
- | Portuguese translation: Anderson Ferreira <anderson@cnpm.embrapa.br>  |
- +-----------------------------------------------------------------------+
-
 
  $Id$
 
@@ -25,9 +22,9 @@
 $labels['username']  = 'Usuário';
 $labels['password']  = 'Senha';
 $labels['server']    = 'Servidor';
-$labels['login']     = 'Login';
+$labels['login']     = 'Entrar';
 
-// Barra de tarefas
+// taskbar
 $labels['logout']   = 'Sair';
 $labels['mail']     = 'E-mail';
 $labels['settings'] = 'Configurações pessoais';
@@ -35,20 +32,14 @@
 
 // Nome das pastas de correio
 $labels['inbox']  = 'Caixa de entrada';
-# Added by Cadu
-# start
-$labels['inbox']['drafts']='Rascunhos';
-$labels['inbox']['sent']='Enviados';
-$labels['inbox']['trash']='Lixeira';
-# end
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Lixeira';
 $labels['drafts'] = 'Rascunhos';
-$labels['junk']   = 'Spam';
+$labels['junk']   = 'Junk';
 
-// Listagem das mensagem
+// message listing
 $labels['subject'] = 'Assunto';
-$labels['from']    = 'De';
+$labels['from']    = 'Remetente';
 $labels['to']      = 'Para';
 $labels['cc']      = 'Cópia';
 $labels['bcc']     = 'Bcc';
@@ -56,20 +47,20 @@
 $labels['date']    = 'Data';
 $labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
-$labels['organization'] = 'Empresa';
+$labels['organization'] = 'Organização';
 
-// Rótulos
+// aliases
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Mensagens';
+$labels['mailboxlist'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 
-$labels['moveto']   = 'mover para ...';
+$labels['moveto']   = 'mover para...';
 $labels['download'] = 'download';
 
-$labels['filename'] = 'Nome do arquivo';
-$labels['filesize'] = 'Tamanho do arquivo';
+$labels['filename'] = 'Arquivo';
+$labels['filesize'] = 'Tamanho';
 
 $labels['preferhtml'] = 'Prefere HTML';
 $labels['htmlmessage'] = 'Mensagem HTML';
@@ -97,41 +88,52 @@
 
 $labels['today'] = 'Hoje';
 
-// Botões da barra de ferramentas
-$labels['writenewmessage']  = 'Escrever nova mensagem';
+// toolbar buttons
+$labels['writenewmessage']  = 'Criar nova mensagem';
 $labels['replytomessage']   = 'Responder';
+$labels['replytoallmessage'] = 'Responder para todos';
 $labels['forwardmessage']   = 'Encaminhar';
-$labels['deletemessage']    = 'Mover para a lixeira';
+$labels['deletemessage']    = 'Mover para lixeira';
 $labels['printmessage']     = 'Imprimir';
 $labels['previousmessages'] = 'Anterior';
 $labels['nextmessages']     = 'Próximo';
 $labels['backtolist']       = 'Voltar';
+$labels['viewsource']       = 'Exibir código fonte';
 
 $labels['select'] = 'Selecionar';
-$labels['all'] = 'Todos';
-$labels['none'] = 'Nenhum';
-$labels['unread'] = 'Não lido';
+$labels['all'] = 'Todas';
+$labels['none'] = 'Nenhuma';
+$labels['unread'] = 'Não lidas';
 
-// Escrever mensagem
-$labels['compose']  = 'Escrever nova mensagem';
-$labels['sendmessage']  = 'Enviar mensagem agora';
-$labels['addattachment']  = 'Anexar arquivo';
+$labels['compact'] = 'Compactar';
+$labels['empty'] = 'Vazio';
+$labels['purge'] = 'Apagar';
+
+$labels['quota'] = 'Utilização';
+
+
+// message compose
+$labels['compose']  = 'Escrever mensagem';
+$labels['sendmessage']  = 'Enviar';
+$labels['addattachment']  = 'Anexar';
+$labels['charset']  = 'Charset';
 
 $labels['attachments'] = 'Anexos';
-$labels['upload'] = 'Enviar';
+$labels['upload'] = 'Upload';
 $labels['close']  = 'Fechar';
 
-$labels['low']     = 'Baixa';
-$labels['lowest']  = 'Muito baixa';
+$labels['low']     = 'Mais baixo';
+$labels['lowest']  = 'Baixo';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alta';
-$labels['highest'] = 'Urgente';
+$labels['highest'] = 'Mais alta';
 
+$labels['nosubject']  = '(no assunto)';
 $labels['showimages'] = 'Exibir imagens';
 
 
-// Catálogo de endereços
-$labels['name']      = 'Nome';
+// address boook
+$labels['name']      = 'Nome completo';
 $labels['firstname'] = 'Primeiro nome';
 $labels['surname']   = 'Sobrenome';
 $labels['email']     = 'E-Mail';
@@ -142,22 +144,35 @@
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Salvar';
-$labels['delete'] = 'Excluir';
+$labels['delete'] = 'Apagar';
 
 $labels['newcontact']     = 'Criar novo contato';
-$labels['deletecontact']  = 'Excluir contatos selecionados';
-$labels['composeto']      = 'Compor email para ';
-$labels['contactsfromto'] = 'Contatos de $from até $to de $count';
+$labels['addcontact']     = 'Incluir contato selecionado ao catálogo de endereços';
+$labels['deletecontact']  = 'Apagar contatos selecionados';
+$labels['composeto']      = 'Escrever mensagem para';
+$labels['contactsfromto'] = 'Contatos $from - $to of $count';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+
+// LDAP search
+$labels['ldapsearch'] = 'Pesquisa no diretório LDAP';
+
+$labels['ldappublicsearchname']    = 'Nome do contado';
+$labels['ldappublicsearchtype'] = 'Pesquisa exata?';
+$labels['ldappublicserverselect'] = 'Selecionar servidores';
+$labels['ldappublicsearchfield'] = 'Pesquisar em';
+$labels['ldappublicsearchform'] = 'Procurar por um contato';
+$labels['ldappublicsearch'] = 'Pesquisar';
 
 
-// Configurações
+// settings
 $labels['settingsfor']  = 'Configurações para';
 
 $labels['preferences']  = 'Preferências';
 $labels['userpreferences']  = 'Preferências do usuário';
 $labels['editpreferences']  = 'Editar preferências do usuário';
 
-$labels['identities']  = 'Identidade';
+$labels['identities']  = 'Identidades';
 $labels['manageidentities']  = 'Gerenciar identidades para essa conta';
 $labels['newidentity']  = 'Nova identidade';
 
@@ -168,14 +183,19 @@
 $labels['language']  = 'Idioma';
 $labels['timezone']  = 'Time zone';
 $labels['pagesize']  = 'Linhas por página';
+$labels['signature'] = 'Assinatura';
 
-
+$labels['folder']  = 'Pasta';
 $labels['folders']  = 'Pastas';
-$labels['foldername']  = 'Nova pasta';
-$labels['subscribed']  = 'Assinadas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Assinado';
 $labels['create']  = 'Criar';
 $labels['createfolder']  = 'Criar nova pasta';
-$labels['deletefolder']  = 'Excluir pasta';
+$labels['deletefolder']  = 'Apagar pasta';
 $labels['managefolders']  = 'Gerenciar pastas';
 
+$labels['sortby'] = 'Ordenado por';
+$labels['sortasc']  = 'Ascendente';
+$labels['sortdesc'] = 'Descendente';
+
 ?>
\ No newline at end of file
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index af653f9..0b34d60 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -9,9 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
- | Portuguese translation: Anderson Ferreira <anderson@cnpm.embrapa.br>  |
+ | Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -44,15 +42,46 @@
 
 $messages['contactexists'] = 'Um contato com esse e-mail já existe';
 
-$messages['blockedimages'] = 'Para proteger sua privacidade, as imagens desta mensagem foram bloqueadas.';
+$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['nocontactsfound'] = 'Nenhum contato encontrado';
 
 $messages['sendingfailed'] = 'Falha no envio da mensagem';
 
-$messages['errorsaving'] = 'Um erro ocorreu ao salvar a mensagem';
+$messages['errorsaving'] = 'Um erro ocorreu durante o salvamento';
 
+$messages['errormoving'] = 'Não foi possível mover a mensagem';
+
+$messages['errordeleting'] = 'Não foi possível apagar a mensagem';
+
+$messages['deletecontactconfirm']  = 'Deseja realmente excluir os contatos selecionados?';
+
+$messages['deletefolderconfirm']  = 'Deseja realmente excluir esta pasta?';
+
+$messages['purgefolderconfirm']  = 'Deseja realmente excluir todas mensagens desta pasta';
+
+$messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
+
+$messages['noemailwarning'] = 'Por favor, informe um endereço de e-mail válido';
+
+$messages['nonamewarning']  = 'Por favor, informe o nome';
+
+$messages['nopagesizewarning'] = 'Por favor, informe o tamanho da página';
+
+$messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatário';
+
+$messages['nosubjectwarning']  = 'O campo assunto não foi informado. Deseja incluí-lo agora?';
+
+$messages['nobodywarning'] = 'Enviar a mensagem se texto?';
+
+$messages['notsentwarning'] = 'A mensegem não foi enviada, deseja excluí-la?';
+
+$messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
+
+$messages['nocontactsreturned'] = 'Nenhum contato foi encontrado';
+
+$messages['nosearchname'] = 'Por favor, informe o nome do contado ou seu endereço de e-mail';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/ru/labels.inc b/program/localization/ru/labels.inc
index a7543f1..efdaeef 100755
--- a/program/localization/ru/labels.inc
+++ b/program/localization/ru/labels.inc
@@ -2,14 +2,14 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ru/labels.inc                                                |
+ | language/ru_RU/labels.inc                                             |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Maxim Zenin <maxx@webmechanics.ru>, www.webmechanics.ru       |
+ | Author: Maxim Zenin <maxx@webmechanics.ru>                            |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -19,16 +19,16 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'Имя пользователя';
+$labels['username']  = 'Логин';
 $labels['password']  = 'Пароль';
 $labels['server']    = 'Сервер';
-$labels['login']     = 'Логин';
+$labels['login']     = 'Войти';
 
 // taskbar
 $labels['logout']   = 'Выход';
-$labels['mail']     = 'E-Mail';
+$labels['mail']     = 'Почта';
 $labels['settings'] = 'Настройки';
-$labels['addressbook'] = 'Адресная книга';
+$labels['addressbook'] = 'Контакты';
 
 // mailbox names
 $labels['inbox']  = 'Входящие';
@@ -39,11 +39,11 @@
 
 // message listing
 $labels['subject'] = 'Тема';
-$labels['from']    = 'отправитель';
+$labels['from']    = 'Отправитель';
 $labels['to']      = 'Получатель';
 $labels['cc']      = 'Копия';
 $labels['bcc']     = 'Скрытая';
-$labels['replyto'] = 'Отвечать на';
+$labels['replyto'] = 'Обратный адрес';
 $labels['date']    = 'Дата';
 $labels['size']    = 'Размер';
 $labels['priority'] = 'Приоритет';
@@ -53,20 +53,20 @@
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Папки';
-$labels['messagesfromto'] = 'Сообщения  с $from по $to из $count';
+$labels['messagesfromto'] = 'Сообщения с $from по $to из $count';
 $labels['messagenrof'] = 'Сообщение $nr из $count';
 
-$labels['moveto']   = 'переместить в...';
-$labels['download'] = 'загрузить';
+$labels['moveto']   = 'Переместить в...';
+$labels['download'] = 'Загрузить';
 
 $labels['filename'] = 'Имя файла';
 $labels['filesize'] = 'Размер файла';
 
-$labels['preferhtml'] = 'предпочитать HTML';
+$labels['preferhtml'] = 'Предпочитать HTML';
 $labels['htmlmessage'] = 'Сообщение HTML';
 $labels['prettydate'] = 'Красивые даты';
 
-$labels['addtoaddressbook'] = 'Добавить в адресную книгу';
+$labels['addtoaddressbook'] = 'Добавить в контакты';
 
 // weekdays short
 $labels['sun'] = 'Вс';
@@ -91,23 +91,32 @@
 // toolbar buttons
 $labels['writenewmessage']  = 'Новое сообщение';
 $labels['replytomessage']   = 'Ответить';
+$labels['replytoallmessage'] = 'Ответить всем';
 $labels['forwardmessage']   = 'Переслать';
 $labels['deletemessage']    = 'В корзину';
 $labels['printmessage']     = 'Печать';
-$labels['previousmessages'] = 'Показать предыдущее';
-$labels['nextmessages']     = 'Показать следующее';
+$labels['previousmessages'] = 'Предыдущее';
+$labels['nextmessages']     = 'Следующее';
 $labels['backtolist']       = 'К списку сообщений';
-$labels['viewsource']       = 'Показать источник';
+$labels['viewsource']       = 'Исходный текст';
 
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Ничего';
 $labels['unread'] = 'Непрочитанные';
 
+$labels['compact'] = 'Сжать';
+$labels['empty'] = 'Опустошить';
+$labels['purge'] = 'Очистить';
+
+$labels['quota'] = 'Квота';
+
+
 // message compose
-$labels['compose']  = 'Написать';
+$labels['compose']  = 'Написать сообщение';
 $labels['sendmessage']  = 'Отправить сейчас';
-$labels['addattachment']  = 'Вложение';
+$labels['addattachment']  = 'Добавить вложение';
+$labels['charset']  = 'Кодировка';
 
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
@@ -119,29 +128,41 @@
 $labels['high']    = 'Высокий';
 $labels['highest'] = 'Самый высокий';
 
-$labels['showimages'] = 'Показать картинки';
+$labels['nosubject']  = '(без темы)';
+$labels['showimages'] = 'Показать изображения';
 
 
 // address boook
-$labels['name']      = 'Псевдоним';
+$labels['name']      = 'Отображаемое имя';
 $labels['firstname'] = 'Имя';
 $labels['surname']   = 'Фамилия';
 $labels['email']     = 'E-Mail';
 
-$labels['addcontact'] = 'Добавть контакт';
+$labels['addcontact'] = 'Добавить контакт';
 $labels['editcontact'] = 'Редактировать контакт';
 
 $labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save']   = 'Сохранить';
-$labels['delete'] = 'Отмена';
+$labels['delete'] = 'Удалить';
 
-$labels['newcontact']     = 'Создать карточку контакта';
+$labels['newcontact']     = 'Создать новый контакт';
+$labels['addcontact']     = 'Добавить выбранные контакты в список контактов';
 $labels['deletecontact']  = 'Удалить выбранные контакты';
-$labels['composeto']      = 'Новое сообщение контакту';
+$labels['composeto']      = 'Создать сообщение для выбранных контактов';
 $labels['contactsfromto'] = 'Контакты с $from по $to из $count';
 $labels['print']          = 'Печать';
 $labels['export']         = 'Экспорт';
+
+// LDAP search
+$labels['ldapsearch'] = 'Поиск в каталоге LDAP';
+
+$labels['ldappublicsearchname']    = 'Имя';
+$labels['ldappublicsearchtype'] = 'Точное совпадение?';
+$labels['ldappublicserverselect'] = 'Выбрать сервер';
+$labels['ldappublicsearchfield'] = 'искать на';
+$labels['ldappublicsearchform'] = 'Искать контакт';
+$labels['ldappublicsearch'] = 'Искать';
 
 
 // settings
@@ -153,24 +174,28 @@
 
 $labels['identities']  = 'Профили';
 $labels['manageidentities']  = 'Управление профилями';
-$labels['newidentity']  = 'новый профиль';
+$labels['newidentity']  = 'Новый профиль';
 
-$labels['newitem']  = 'Новый элемент';
-$labels['edititem']  = 'Редактировать элемент';
+$labels['newitem']  = 'Новый';
+$labels['edititem']  = 'Правка';
 
-$labels['setdefault']  = 'Сделать основным';
+$labels['setdefault']  = 'Использовать по умолчанию';
 $labels['language']  = 'Язык';
 $labels['timezone']  = 'Часовой пояс';
 $labels['pagesize']  = 'Строк на странице';
+$labels['signature'] = 'Подпись';
 
-
+$labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Имя папки';
 $labels['subscribed']  = 'Подписан';
 $labels['create']  = 'Создать';
 $labels['createfolder']  = 'Создать новую папку';
 $labels['deletefolder']  = 'Удалить папку';
-$labels['managefolders']  = 'Настройка папок';
+$labels['managefolders']  = 'Управление папками';
 
+$labels['sortby'] = 'Сортировать по';
+$labels['sortasc']  = 'Возрастанию';
+$labels['sortdesc'] = 'Убыванию';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/ru/messages.inc b/program/localization/ru/messages.inc
index 631c852..aba5b01 100755
--- a/program/localization/ru/messages.inc
+++ b/program/localization/ru/messages.inc
@@ -2,14 +2,14 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/ru/messages.inc                                              |
+ | language/ru_RU/messages.inc                                           |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Maxim Zenin <maxx@webmechanics.ru>, www.webmechanics.ru       |
+ | Author: Maxim Zenin <maxx@webmechanics.ru>                            |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -18,43 +18,74 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Неудачная авторизация';
+$messages['loginfailed']  = 'Неудачная попытка входа';
 
-$messages['cookiesdisabled'] = 'Ваш броузер не поддерживает cookies';
+$messages['cookiesdisabled'] = 'Ваш броузер не принимает cookie';
 
-$messages['sessionerror'] = 'Ваш сеанс истек';
+$messages['sessionerror'] = 'Ваша сессия устарела';
 
-$messages['imaperror'] = 'неудачное соединение с IMAP сервером';
+$messages['imaperror'] = 'Неудачное соединение с IMAP сервером';
 
-$messages['nomessagesfound'] = 'Сообщения в этой папке не найдены';
+$messages['nomessagesfound'] = 'Сообщений не найдено';
 
-$messages['loggedout'] = 'Ваша сессия завершена. До свидания!';
+$messages['loggedout'] = 'Ваша сессия завершена. До свидания!!';
 
-$messages['mailboxempty'] = 'почтовый ящик пуст';
+$messages['mailboxempty'] = 'Почтовый ящик пуст';
+
+$messages['loading'] = 'Загрузка...';
 
 $messages['loadingdata'] = 'Загрузка данных...';
+
+$messages['sendingmessage'] = 'Отправка сообщения...';
 
 $messages['messagesent'] = 'Сообщение отправлено';
 
 $messages['successfullysaved'] = 'Сохранено';
 
-$messages['addedsuccessfully'] = 'Контакт добавлен в адресную книгу';
+$messages['addedsuccessfully'] = 'Контакт добавлен в список контактов';
 
-$messages['contactexists'] = 'Контакт с указанным адресом уже содержится в адресной книге';
+$messages['contactexists'] = 'Контакт с этим адресом e-mail уже существует';
 
-$messages['blockedimages'] = 'Для вашей безопасности изображения с удаленных сайтов заблокированы.';
+$messages['blockedimages'] = 'В целях безопасности загрузка изображений заблокирована.';
 
-$messages['encryptedmessage'] = 'Это сообщение зашифровано и не может быть отображено. Извините.';
+$messages['encryptedmessage'] = 'Сообщение зашифровано и не может быть показано. Извините!';
 
-$messages['nocontactsfound'] = 'Контактов не найдено';
+$messages['nocontactsfound'] = 'Контакты не найдены';
 
-$messages['sendingfailed'] = 'Невоможно отправить сообщение';
+$messages['sendingfailed'] = 'Не удалось отправить сообщение';
 
-$messages['errorsaving'] = 'Невозможно сохранить';
+$messages['errorsaving'] = 'В процессе сохранения произошла ошибка';
 
-$messages['errormoving'] = 'Невозможно перенести сообщение';
+$messages['errormoving'] = 'Не удалось переместить сообщение';
 
-$messages['errordeleting'] = 'Невозможно удалить сообщение';
+$messages['errordeleting'] = 'Не удалось удалить сообщение';
 
+$messages['deletecontactconfirm']  = 'Вы действительно хотите удалить выделенные контакты?';
+
+$messages['deletefolderconfirm']  = 'Вы действительно хотите удалить эту папку?';
+
+$messages['purgefolderconfirm']  = 'Вы действительно хотите удалить все сообщения в этой папке?';
+
+$messages['formincomplete'] = 'Заполнены не все поля';
+
+$messages['noemailwarning'] = 'Пожалуйста, введите корректный адрес электронной почты';
+
+$messages['nonamewarning']  = 'Пожалуйста, введите имя';
+
+$messages['nopagesizewarning'] = 'Пожалуйста, введите размер страницы';
+
+$messages['norecipientwarning'] = 'Пожалуйста, введите имя получателя';
+
+$messages['nosubjectwarning']  = 'Поле "Тема" не заполнено. Хотите заполнить его сейчас?';
+
+$messages['nobodywarning'] = 'Отправить сообщение без текста?';
+
+$messages['notsentwarning'] = 'Сообщение не было отправлено. Вы хотите отказаться от отправки?';
+
+$messages['noldapserver'] = 'Пожалуйста, выберите LDAP сервер для поиска';
+
+$messages['nocontactsreturned'] = 'Контакты не найдены';
+
+$messages['nosearchname'] = 'Пожалуйста, введите имя или адрес E-Mail';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/se/labels.inc b/program/localization/se/labels.inc
index 9f8ad58..acd0081 100644
--- a/program/localization/se/labels.inc
+++ b/program/localization/se/labels.inc
@@ -1,4 +1,4 @@
-<?php
+<?php
 
 /*
  +-----------------------------------------------------------------------+
@@ -9,7 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Nygren <f.nygren@gmail.com>                           |
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -31,30 +31,30 @@
 $labels['addressbook'] = 'Adressbok';
 
 // mailbox names
-$labels['inbox']  = 'Inbox';
+$labels['inbox']  = 'Inkorg';
 $labels['sent']   = 'Skickat';
 $labels['trash']  = 'Papperskorg';
-$labels['drafts'] = 'Utskick';
-$labels['junk']   = 'Skräppost';
+$labels['drafts'] = 'Utkast';
+$labels['junk']   = 'Skräp';
 
 // message listing
 $labels['subject'] = 'Ämne';
 $labels['from']    = 'Avsändare';
 $labels['to']      = 'Mottagare';
 $labels['cc']      = 'Kopia';
-$labels['bcc']     = 'Bcc';
-$labels['replyto'] = 'Svar-till';
+$labels['bcc']     = 'Hemlig kopia';
+$labels['replyto'] = 'Svar till';
 $labels['date']    = 'Datum';
 $labels['size']    = 'Storlek';
-$labels['priority'] = 'Prioritering';
+$labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 
 // aliases
-$labels['reply-to'] = $labels['replyto'];
+$labels['reply-to'] = $labels['svartill'];
 
 $labels['mailboxlist'] = 'Mappar';
-$labels['messagesfromto'] = 'Meddelande $from till $to av $count';
-$labels['messagenrof'] = 'Message $nr av $count';
+$labels['messagesfromto'] = 'Meddelanden $from till $to av $count';
+$labels['messagenrof'] = 'Meddelande $nr av $count';
 
 $labels['moveto']   = 'flytta till...';
 $labels['download'] = 'ladda ner';
@@ -63,7 +63,7 @@
 $labels['filesize'] = 'Filstorlek';
 
 $labels['preferhtml'] = 'Föredra HTML';
-$labels['htmlmessage'] = 'HTML-meddelanden';
+$labels['htmlmessage'] = 'HTML-meddelande';
 $labels['prettydate'] = 'Fina datum';
 
 $labels['addtoaddressbook'] = 'Lägg till adressbok';
@@ -75,7 +75,7 @@
 $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
-$labels['sat'] = 'Lös';
+$labels['sat'] = 'Lör';
 
 // weekdays long
 $labels['sunday']    = 'Söndag';
@@ -84,33 +84,42 @@
 $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
-$labels['saturday']  = 'Lödag';
+$labels['saturday']  = 'Lördag';
 
 $labels['today'] = 'Idag';
 
 // toolbar buttons
 $labels['writenewmessage']  = 'Skapa nytt meddelande';
 $labels['replytomessage']   = 'Svar på meddelande';
-$labels['replytoallmessage'] = 'Svara alla';
+$labels['replytoallmessage'] = 'Svar till avsändare och alla mottagare';
 $labels['forwardmessage']   = 'Skicka vidare meddelande';
-$labels['deletemessage']    = 'Flytta till papperskorgen';
+$labels['deletemessage']    = 'Flytta meddelande till papperskorgen';
 $labels['printmessage']     = 'Skriv ut';
 $labels['previousmessages'] = 'Visa tidigare';
 $labels['nextmessages']     = 'Visa nästa';
 $labels['backtolist']       = 'Tillbaka till meddelandelistan';
+$labels['viewsource']       = 'Visa källa';
 
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
 $labels['unread'] = 'Oläst';
 
-// message compose
-$labels['compose']  = 'Skriv meddelande';
-$labels['sendmessage']  = 'Skicka meddelande nu';
-$labels['addattachment']  = 'Bifoga fil';
+$labels['compact'] = 'Packa';
+$labels['empty'] = 'Tom';
+$labels['purge'] = 'Rensa';
 
-$labels['attachments'] = 'Filer';
-$labels['upload'] = 'Ladda upp';
+$labels['quota'] = 'Diskutrymme';
+
+
+// message compose
+$labels['compose']  = 'Skapa nytt meddelande';
+$labels['sendmessage']  = 'Skicka meddelande nu';
+$labels['addattachment']  = 'Bifoga en fil';
+$labels['charset']  = 'Teckenkodning';
+
+$labels['attachments'] = 'Bilagor';
+$labels['upload'] = 'Uppladdning';
 $labels['close']  = 'Stäng';
 
 $labels['low']     = 'Låg';
@@ -119,6 +128,7 @@
 $labels['high']    = 'Hög';
 $labels['highest'] = 'Högst';
 
+$labels['nosubject']  = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 
 
@@ -129,17 +139,30 @@
 $labels['email']     = 'E-post';
 
 $labels['addcontact'] = 'Lägg till ny kontakt';
-$labels['editcontact'] = 'Ändra kontakt';
+$labels['editcontact'] = 'Redigera kontakt';
 
-$labels['edit']   = 'Ändra';
+$labels['edit']   = 'Redigera';
 $labels['cancel'] = 'Avbryt';
 $labels['save']   = 'Spara';
 $labels['delete'] = 'Radera';
 
 $labels['newcontact']     = 'Skapa nytt kontaktkort';
+$labels['addcontact']     = 'Lägg till vald kotakt till adressboken';
 $labels['deletecontact']  = 'Radera valda kontakter';
 $labels['composeto']      = 'Skriv e-post till';
 $labels['contactsfromto'] = 'Kontakter $from till $to av $count';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Exportera';
+
+// LDAP search
+$labels['ldapsearch'] = 'LDAP katalogsök';
+
+$labels['ldappublicsearchname']    = 'Kontaktnamn';
+$labels['ldappublicsearchtype'] = 'Exakt matchning?';
+$labels['ldappublicserverselect'] = 'Valda servrar';
+$labels['ldappublicsearchfield'] = 'Sök på';
+$labels['ldappublicsearchform'] = 'Sök kontakt';
+$labels['ldappublicsearch'] = 'Sök';
 
 
 // settings
@@ -149,9 +172,9 @@
 $labels['userpreferences']  = 'Användarinställningar';
 $labels['editpreferences']  = 'Ändra användarinställningar';
 
-$labels['identities']  = 'Identiteter';
-$labels['manageidentities']  = 'Hantera identiteter för kontot';
-$labels['newidentity']  = 'Ny identitet';
+$labels['identities']  = 'Profiler';
+$labels['manageidentities']  = 'Hantera profiler för detta konto';
+$labels['newidentity']  = 'Ny profil';
 
 $labels['newitem']  = 'Ny post';
 $labels['edititem']  = 'Ändra post';
@@ -160,8 +183,9 @@
 $labels['language']  = 'Språk';
 $labels['timezone']  = 'Tidszon';
 $labels['pagesize']  = 'Rader per sida';
+$labels['signature'] = 'Signatur';
 
-
+$labels['folder']  = 'Mapp';
 $labels['folders']  = 'Mappar';
 $labels['foldername']  = 'Mappnamn';
 $labels['subscribed']  = 'Ansluten';
@@ -170,5 +194,8 @@
 $labels['deletefolder']  = 'Radera mapp';
 $labels['managefolders']  = 'Hantera mappar';
 
+$labels['sortby'] = 'Sortera på';
+$labels['sortasc']  = 'Sortera stigande';
+$labels['sortdesc'] = 'Sortera fallande';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/se/messages.inc b/program/localization/se/messages.inc
index ad06b7b..9e86676 100644
--- a/program/localization/se/messages.inc
+++ b/program/localization/se/messages.inc
@@ -1,15 +1,15 @@
-<?php
+<?php
 
 /*
  +-----------------------------------------------------------------------+
- | language/se/messages.inc                                              |
+ | language/en/messages.inc                                              |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Nygren <f.nygren@gmail.com>                           |
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -24,35 +24,68 @@
 
 $messages['sessionerror'] = 'Din session är felaktig eller har gått ut';
 
-$messages['imaperror'] = 'Kommunikationen med IMAP-servern misslyckades';
+$messages['imaperror'] = 'Kontakt med IMAP-servern misslyckades';
 
-$messages['nomessagesfound'] = 'Inga meddelanden i den här mappen';
+$messages['nomessagesfound'] = 'Inga meddelanden hittades i din inkorg';
 
-$messages['loggedout'] = 'Du har avslutat sessionen. Hej då!';
+$messages['loggedout'] = 'Du har framgångsrikt avslutat din session. Hej då!';
 
-$messages['mailboxempty'] = 'Mappen är tom';
+$messages['mailboxempty'] = 'Mejlboxen är tom';
 
-$messages['loading'] = 'Laddar....';
+$messages['loading'] = 'Laddar...';
 
 $messages['loadingdata'] = 'Laddar data...';
 
-$messages['messagesent'] = 'Meddelande skickades';
+$messages['sendingmessage'] = 'Skickar meddelande...';
+
+$messages['messagesent'] = 'Meddelandet har skickats';
 
 $messages['successfullysaved'] = 'Sparat';
 
-$messages['addedsuccessfully'] = 'Kontakt har lagts till i adressboken';
+$messages['addedsuccessfully'] = 'Kontakten har lagts till i adressboken';
 
-$messages['contactexists'] = 'En kontakt med den angivna e-postadressen existerar redan';
+$messages['contactexists'] = 'En kontakt med den här mejladressen finns redan';
 
-$messages['blockedimages'] = 'För att skydda dig har externa bilder blockerats från meddelandet';
+$messages['blockedimages'] = 'För att skydda dig är bilder blockerade.';
 
-$messages['encryptedmessage'] = 'Det här är ett krypterat meddelande som inte kan visas. Tyvärr!';
+$messages['encryptedmessage'] = 'Det här ett krypterat meddelande som inte kan visas. Tyvärr!';
 
 $messages['nocontactsfound'] = 'Inga kontakter hittades';
 
 $messages['sendingfailed'] = 'Misslyckades med att skicka meddelandet';
 
-$messages['errorsaving'] = 'Problem med sparandet uppstod';
+$messages['errorsaving'] = 'Ett fel uppstod vid sparandet';
 
+$messages['errormoving'] = 'Meddelandet kunde inte flyttas';
 
-?>
\ No newline at end of file
+$messages['errordeleting'] = 'Meddelandet kunde inte raderas';
+
+$messages['deletecontactconfirm']  = 'Vill du verkligen radera valda kontakter?';
+
+$messages['deletefolderconfirm']  = 'Vill du verkligen radera den här mappen?';
+
+$messages['purgefolderconfirm']  = 'Vill du verkligen radera alla meddelanden i den här mappen?';
+
+$messages['formincomplete'] = 'Formuläret var inte ifyllt i sin helhet';
+
+$messages['noemailwarning'] = 'Vänligen ange en giltig e-postadress';
+
+$messages['nonamewarning']  = 'Vänligen ange ett namn';
+
+$messages['nopagesizewarning'] = 'Vänligen ange en sidstorlek';
+
+$messages['norecipientwarning'] = 'Vänligen ange minst en mottagare';
+
+$messages['nosubjectwarning']  = 'Ämnesfältet är tomt. Vill du lägga till något nu?';
+
+$messages['nobodywarning'] = 'Skicka det här meddelandet utan text?';
+
+$messages['notsentwarning'] = 'Meddelande har inte skickats. Vill du avbryta meddelandet?';
+
+$messages['noldapserver'] = 'Vänligen ange en LDAP-server att söka';
+
+$messages['nocontactsreturned'] = 'Inga kontakter hittades';
+
+$messages['nosearchname'] = 'Vänligen ange ett kontaktnamn eller e-postadress';
+
+?>
diff --git a/program/localization/sk/labels.inc b/program/localization/sk/labels.inc
index 216df86..4443d17 100644
--- a/program/localization/sk/labels.inc
+++ b/program/localization/sk/labels.inc
@@ -17,9 +17,8 @@
 */
 
 $labels = array();
-$utf8_decoding = TRUE;
 // login page
-$labels['username']  = 'Užívateľ';
+$labels['username']  = 'Prihlasovacie meno';
 $labels['password']  = 'Heslo';
 $labels['server']    = 'Server';
 $labels['login']     = 'Prihlásiť';
@@ -42,7 +41,7 @@
 $labels['from']    = 'Odosielateľ';
 $labels['to']      = 'Adresát';
 $labels['cc']      = 'Kópia';
-$labels['bcc']     = 'Bcc';
+$labels['bcc']     = 'Tajná kópia';
 $labels['replyto'] = 'Odpovedať na';
 $labels['date']    = 'Dátum';
 $labels['size']    = 'Veľkosť';
@@ -64,7 +63,7 @@
 
 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
 $labels['htmlmessage'] = 'HTML správa';
-$labels['prettydate'] = '';
+$labels['prettydate'] = 'Pretty dates';
 
 $labels['addtoaddressbook'] = 'Pridaj do adresára';
 
@@ -139,12 +138,23 @@
 $labels['save']   = 'Ulož';
 $labels['delete'] = 'Zmaž';
 
-$labels['newcontact']     = 'Vytvor novú kartu';
-$labels['deletecontact']  = 'Zmaž zvolené karty';
+$labels['newcontact']     = 'Vytvor nový kontakt';
+$labels['addcontact']     = 'Pridaj zvolený kontakt do vášho adresára';
+$labels['deletecontact']  = 'Zmaž zvolené kontakty';
 $labels['composeto']      = 'Vytvor správu';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
 $labels['print']          = 'Tlač';
 $labels['export']         = 'Export';
+
+// LDAP search
+$labels['ldapsearch'] = 'LDAP adresárové vyhľadávanie';
+
+$labels['ldappublicsearchname']    = 'Hľadaný kontakt';
+$labels['ldappublicsearchtype'] = 'Presná zhoda?';
+$labels['ldappublicserverselect'] = 'Zvoľ server';
+$labels['ldappublicsearchfield'] = 'Hľadaj podľa';
+$labels['ldappublicsearchform'] = 'Vyhľadávanie kontaktov';
+$labels['ldappublicsearch'] = 'Hľadaj';
 
 
 // settings
@@ -167,6 +177,7 @@
 $labels['pagesize']  = 'Riadky na stránku';
 $labels['signature'] = 'Podpis';
 
+$labels['folder']  = 'Zložka';
 $labels['folders']  = 'Zložky';
 $labels['foldername']  = 'Meno zložky';
 $labels['subscribed']  = 'Podpísaný';
diff --git a/program/localization/sk/messages.inc b/program/localization/sk/messages.inc
index 83abc5d..31b0e55 100644
--- a/program/localization/sk/messages.inc
+++ b/program/localization/sk/messages.inc
@@ -60,7 +60,11 @@
 
 $messages['errordeleting'] = 'Nemôžem zmazať správu';
 
+$messages['deletecontactconfirm']  = 'Ste si istý, že chcete zmazať zvolený(é) konakt(y)?';
+
 $messages['deletefolderconfirm']  = 'Ste si istý, že chcete zmazať túto zložku?';
+
+$messages['purgefolderconfirm']  = 'Ste si istý, že chcete zmazať všetky správy v tejto zložke?';
 
 $messages['formincomplete'] = 'Formulár nie je kompletne vyplnený';
 
@@ -70,7 +74,7 @@
 
 $messages['nopagesizewarning'] = 'Prosím zadajte počet strán';
 
-$messages['norecipientwarning'] = 'Prosím vložte aspoň jedného príjemcu';
+$messages['norecipientwarning'] = 'Prosím vložte aspoň jedného adresáta';
 
 $messages['nosubjectwarning']  = 'Predmet správy je prázdny. Chcete ho teraz zadať?';
 
@@ -78,5 +82,10 @@
 
 $messages['notsentwarning'] = 'Správa nebola odoslaná, chcete ju zrušiť?';
 
+$messages['noldapserver'] = 'Prosím zvoľ LDAP server pre vyhľadávanie';
+
+$messages['nocontactsreturned'] = 'Neboli nájdené žiadne kontakty';
+
+$messages['nosearchname'] = 'Prosím vložte meno alebo emailovu adresu';
 
 ?>
diff --git a/program/localization/tw/labels.inc b/program/localization/tw/labels.inc
index 4537d82..d88259f 100755
--- a/program/localization/tw/labels.inc
+++ b/program/localization/tw/labels.inc
@@ -2,14 +2,14 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en/labels.inc                                                |
+ | language/tw/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>                        |
+ | Author: kourge <kourge@gmail.com>                                     |
  +-----------------------------------------------------------------------+
 
  $Id$
diff --git a/program/localization/tw/messages.inc b/program/localization/tw/messages.inc
index 7697cf5..e57bc73 100755
--- a/program/localization/tw/messages.inc
+++ b/program/localization/tw/messages.inc
@@ -2,14 +2,14 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en/messages.inc                                              |
+ | language/tw/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>                        |
+ | Author: kourge <kourge@gmail.com>                                     |
  +-----------------------------------------------------------------------+
 
  $Id$

--
Gitblit v1.9.1