Synched translations from launchpad/masterv0.8.0

261 files changed, 6893 insertions, 1297 deletions

diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
new file mode 100644
index 000000000..90eb254ad
--- /dev/null
+++ b/plugins/acl/localization/bs_BA.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Razmjena';
+$labels['myrights'] = 'Prava pristupa';
+$labels['username'] = 'Korisnik:';
+$labels['advanced'] = 'napredni mod';
+$labels['newuser'] = 'Dodaj unos';
+$labels['actions'] = 'Akcije za prava pristupa...';
+$labels['anyone'] = 'Svi korisnici (bilo ko)';
+$labels['anonymous'] = 'Gosti (anonimno)';
+$labels['identifier'] = 'Identifikator';
+$labels['acll'] = 'Prona��i';
+$labels['shortacll'] = 'Prona��i';
+$labels['aclr'] = 'Pro��itaj poruke';
+$labels['acls'] = 'Zadr鱉i stanje pregleda';
+$labels['aclw'] = 'Oznake za pisanje';
+$labels['acli'] = 'Umetni (Kopiraj u)';
+$labels['aclp'] = 'Objavi';
+$labels['shortaclp'] = 'Objavi';
+$labels['aclc'] = 'Napravi podfoldere';
+$labels['aclk'] = 'Napravi podfoldere';
+$labels['acld'] = 'Obri禳i poruke';
+$labels['aclt'] = 'Obri禳i poruke';
+$labels['acle'] = 'Izbri禳i';
+$labels['shortacle'] = 'Izbri禳i';
+$labels['aclx'] = 'Obri禳i folder';
+$labels['acla'] = 'Administracija';
+$labels['shortacla'] = 'Administracija';
+$labels['aclfull'] = 'Puna kontrola';
+$labels['aclother'] = 'Ostalo';
+$labels['shortaclother'] = 'Ostalo';
+$labels['aclread'] = 'Pro��itano';
+$labels['shortaclr'] = 'Pro��itano';
+$labels['shortaclread'] = 'Pro��itano';
+$labels['aclwrite'] = 'Pi禳i';
+$labels['shortaclw'] = 'Pi禳i';
+$labels['shortaclwrite'] = 'Pi禳i';
+$labels['acldelete'] = 'Obri禳i';
+$labels['shortacld'] = 'Obri禳i';
+$labels['shortaclt'] = 'Obri禳i';
+$labels['shortacldelete'] = 'Obri禳i';
+$labels['shortacls'] = 'Zadr鱉i';
+$labels['shortacli'] = 'Umetni';
+$labels['shortaclc'] = 'Kreiraj';
+$labels['shortaclk'] = 'Kreiraj';
+$labels['shortaclx'] = 'Brisanje foldera';
+$labels['longacll'] = 'Ovaj folder je vidljiv u listama i mogu��e je izvr禳iti pretplatu na njega';
+$labels['longaclr'] = 'Folder je mogu��e otvoriti radi ��itanja';
+$labels['longaclread'] = 'Folder je mogu��e otvoriti radi ��itanja';
+$labels['longacls'] = 'Oznaka ��itanja za poruke se mo鱉e promijeniti';
+$labels['longaclw'] = 'Oznake za poruke i klju��ne rije��i je mogu��e promijeniti, osim za pregledano i obrisano';
+$labels['longacli'] = 'Mogu��e je kopirati i zapisivati poruke u folder';
+$labels['longaclp'] = 'Mogu��e je objavljivati poruke u ovaj folder';
+$labels['longaclc'] = 'Mogu��e je kreirati (ili preimenovati) foldere diretno ispod ovog foldera';
+$labels['longaclk'] = 'Mogu��e je kreirati (ili preimenovati) foldere diretno ispod ovog foldera';
+$labels['longacld'] = 'Oznaka za obrisane poruke se mo鱉e mijenjati';
+$labels['longaclt'] = 'Oznaka za obrisane poruke se mo鱉e mijenjati';
+$labels['longacle'] = 'Poruke je mogu��e obrisati';
+$labels['longaclx'] = 'Folder je mogu��e obrisati ili preimenovati';
+$labels['longacla'] = 'Pristupna prava foldera je mogu��e promijeniti';
+$labels['longaclfull'] = 'Puna kontrola uklju��uju��i i administraciju foldera';
+$labels['longaclwrite'] = 'Mogu��e je ozna��avati, zapisivati i kopirati poruke u folder';
+$labels['longacldelete'] = 'Mogu��e je obrisati poruke';
+$labels['deleting'] = 'Bri禳em prava pristupa...';
+$labels['saving'] = 'Snimam prava pristupa...';
+$labels['updatesuccess'] = 'Prava pristupa su uspje禳no promijenjena';
+$labels['deletesuccess'] = 'Prava pristupa su uspje禳no obrisana';
+$labels['createsuccess'] = 'Prava pristupa su uspje禳no dodana';
+$labels['updateerror'] = 'Nije mogu��e a鱉urirati prava pristupa';
+$labels['deleteerror'] = 'Nije mogu��e obrisati prava pristupa';
+$labels['createerror'] = 'Nije mogu��e dodati prava pristupa';
+$labels['deleteconfirm'] = 'Jeste li sigurni da 鱉elite ukloniti prava pristupa za odabrane korisnike?';
+$labels['norights'] = 'Niste odabrali prava pristupa!';
+$labels['nouser'] = 'Niste odabrali korisni��ko ime!';
+
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
new file mode 100644
index 000000000..c182736c2
--- /dev/null
+++ b/plugins/acl/localization/ca_ES.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Comparteix';
+$labels['myrights'] = 'Permisos d\'acc矇s';
+$labels['username'] = 'Usuari:';
+$labels['advanced'] = 'Mode avan癟at';
+$labels['newuser'] = 'Afegeix una entrada';
+$labels['actions'] = 'Accions dels permisos d\'acc矇s';
+$labels['anyone'] = 'Tots els usuaris';
+$labels['anonymous'] = 'Convidats';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Cerca';
+$labels['shortacll'] = 'Cerca';
+$labels['aclr'] = 'Llegeix missatges';
+$labels['acls'] = 'Conserva\'l com a llegit';
+$labels['aclw'] = 'Escriu marques';
+$labels['acli'] = 'Insereix (copia dins)';
+$labels['aclp'] = 'Envia l\'entrada';
+$labels['shortaclp'] = 'Envia l\'entrada';
+$labels['aclc'] = 'Crea subcarpetes';
+$labels['aclk'] = 'Crea subcarpetes';
+$labels['acld'] = 'Suprimeix missatges';
+$labels['aclt'] = 'Suprimeix missatges';
+$labels['acle'] = 'Buida';
+$labels['shortacle'] = 'Buida';
+$labels['aclx'] = 'Suprimeix carpeta';
+$labels['acla'] = 'Administra';
+$labels['shortacla'] = 'Administra';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Un altre';
+$labels['shortaclother'] = 'Un altre';
+$labels['aclread'] = 'Lectura';
+$labels['shortaclr'] = 'Lectura';
+$labels['shortaclread'] = 'Lectura';
+$labels['aclwrite'] = 'Escriptura';
+$labels['shortaclw'] = 'Escriptura';
+$labels['shortaclwrite'] = 'Escriptura';
+$labels['acldelete'] = 'Suprimeix';
+$labels['shortacld'] = 'Suprimeix';
+$labels['shortaclt'] = 'Suprimeix';
+$labels['shortacldelete'] = 'Suprimeix';
+$labels['shortacls'] = 'Conserva';
+$labels['shortacli'] = 'Insereix';
+$labels['shortaclc'] = 'Crea';
+$labels['shortaclk'] = 'Crea';
+$labels['shortaclx'] = 'Suprimeix carpeta';
+$labels['longacll'] = 'La carpeta 矇s visible a les llistes i s\'hi pot subscriure';
+$labels['longaclr'] = 'La carpeta pot ser oberta per llegir';
+$labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
+$labels['longacls'] = 'Els missatges marcats com a Llegit poden ser canviats';
+$labels['longaclw'] = 'Les marques i les paraules clau dels missatges poden ser canviats, excepte els Llegit i Suprimit';
+$labels['longacli'] = 'Els missatges poden ser escrits i copiats a la carpeta';
+$labels['longaclp'] = 'Els missatges poden ser enviats a aquesta carpeta';
+$labels['longaclc'] = 'Es poden crear (or reanomenar) carpetes directament sota aquesta carpeta';
+$labels['longaclk'] = 'Es poden crear (or reanomenar) carpetes directament sota aquesta carpeta';
+$labels['longacld'] = 'Poden ser canviats els missatges amb l\'indicador Suprimit';
+$labels['longaclt'] = 'Poden ser canviats els missatges amb l\'indicador Suprimit';
+$labels['longacle'] = 'Els missatges poden ser purgats';
+$labels['longaclx'] = 'La carpeta pot ser suprimida o reanomenada';
+$labels['longacla'] = 'Els permisos d\'acc矇s a la carpeta poden ser canviats';
+$labels['longaclfull'] = 'Control total fins i tot la gesti籀 de carpetes';
+$labels['longaclwrite'] = 'Els missatges poden ser marcats, escrits o copiats a la carpeta';
+$labels['longacldelete'] = 'Els missatges poden ser suprimits';
+$labels['deleting'] = 'Suprimint els permisos d\'acc矇s...';
+$labels['saving'] = 'Desant els permisos d\'acc矇s...';
+$labels['updatesuccess'] = 'Els permisos d\'acc矇s han estat canviats correctament';
+$labels['deletesuccess'] = 'Els permisos d\'acc矇s han estat suprimits correctament';
+$labels['createsuccess'] = 'Els permisos d\'acc矇s han afegits suprimits correctament';
+$labels['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'acc矇s';
+$labels['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'acc矇s';
+$labels['createerror'] = 'No s\'ha pogut afegir els permisos d\'acc矇s';
+$labels['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'acc矇s de l\'usuari o usuaris seleccionats?';
+$labels['norights'] = 'No s\'ha especificat cap perm穩s';
+$labels['nouser'] = 'No s\'ha especificat cap nom d\'usuari';
+
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
new file mode 100644
index 000000000..f37acf68b
--- /dev/null
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Martin B獺rta <martin.bartama@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Sd穩len穩';
+$labels['myrights'] = 'P��穩stupov獺 pr獺va';
+$labels['username'] = 'U鱉ivatel:';
+$labels['advanced'] = 'pokro��il羸 re鱉im';
+$labels['newuser'] = 'P��idat z獺znam';
+$labels['anyone'] = 'V禳ichni u鱉ivatel矇 (kdokoli)';
+$labels['anonymous'] = 'Host矇 (anonymn穩)';
+$labels['identifier'] = 'Identifik獺tor';
+$labels['aclr'] = '��穩st zpr獺vy';
+$labels['aclw'] = 'Zapsat ozna��en穩';
+$labels['acli'] = 'Vlo鱉it (Kop穩rovat do)';
+$labels['aclp'] = 'Odeslat';
+$labels['shortaclp'] = 'Odeslat';
+$labels['aclc'] = 'Vytvo��it podslo鱉ky';
+$labels['aclk'] = 'Vytvo��it podslo鱉ky';
+$labels['acld'] = 'Smazat zpr獺vy';
+$labels['aclt'] = 'Smazat zpr獺vy';
+$labels['acle'] = 'Vypr獺zdnit';
+$labels['shortacle'] = 'Vypr獺zdnit';
+$labels['aclx'] = 'Smazat slo鱉ku';
+$labels['acla'] = 'Spravovat';
+$labels['shortacla'] = 'Spravovat';
+$labels['aclfull'] = 'Pln羸 p��穩stup';
+$labels['aclother'] = 'Ostatn穩';
+$labels['shortaclother'] = 'Ostatn穩';
+$labels['aclread'] = '��穩st';
+$labels['shortaclr'] = '��穩st';
+$labels['shortaclread'] = '��穩st';
+$labels['aclwrite'] = 'Zapsat';
+$labels['shortaclw'] = 'Zapsat';
+$labels['shortaclwrite'] = 'Zapsat';
+$labels['acldelete'] = 'Smazat';
+$labels['shortacld'] = 'Smazat';
+$labels['shortaclt'] = 'Smazat';
+$labels['shortacldelete'] = 'Smazat';
+$labels['shortacls'] = 'Zachovat';
+$labels['shortacli'] = 'Vlo鱉it';
+$labels['shortaclc'] = 'Vytvo��it';
+$labels['shortaclk'] = 'Vytvo��it';
+$labels['shortaclx'] = 'Mazat slo鱉ky';
+$labels['longaclr'] = 'Slo鱉ka m轡鱉e b羸t otev��ena pro ��ten穩';
+$labels['longaclread'] = 'Slo鱉ka m轡鱉e b羸t otev��ena pro ��ten穩';
+$labels['longacls'] = 'Ozna��en獺 zpr獺va byla zm��n��na';
+$labels['longaclp'] = 'Zpr獺va byla odesl獺na do slo鱉ky';
+$labels['longacle'] = 'Zpr獺va m轡鱉e b羸t smaz獺na';
+$labels['longaclx'] = 'Slo鱉ka m轡鱉e b羸t smaz獺na nebo p��ejmenov獺na';
+$labels['longacla'] = 'P��穩stupov獺 pr獺va slo鱉ky mohou b羸t zm��n��na';
+$labels['longacldelete'] = 'Zpr獺vy mohou b羸t smaz獺ny';
+$labels['deleting'] = 'Odstra��uji p��穩stupov獺 pr獺va...';
+$labels['saving'] = 'Ukl獺d獺m p��穩stupov獺 pr獺va...';
+$labels['updatesuccess'] = 'P��穩stupov獺 pr獺va byla 繳sp��禳n�� zm��n��na';
+$labels['deletesuccess'] = 'P��穩stupov獺 p獺va byla 繳sp��禳n�� odstran��na';
+$labels['createsuccess'] = 'P��穩stupov獺 pr獺va byla 繳sp��禳n�� p��穩d獺na';
+$labels['updateerror'] = 'Nelze upravit p��穩stupov獺 pr獺va';
+$labels['deleteerror'] = 'Nelze odstranit p��穩stupov獺 pr獺va';
+$labels['createerror'] = 'Nelze p��idat p��穩stupov獺 pr獺va';
+$labels['deleteconfirm'] = 'Opravdu si p��ejete odstranit p��穩stupov獺 pr獺va pro vybran矇(ho) u鱉ivatele?';
+$labels['norights'] = 'Nejsou specifikov獺na 鱉獺dn獺 pr獺va!';
+$labels['nouser'] = 'Nen穩 specifikov獺no u鱉ivatelsk矇 jm矇no';
+
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
new file mode 100644
index 000000000..20dd1495b
--- /dev/null
+++ b/plugins/acl/localization/cy_GB.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Dafydd Tomos                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Rhannu';
+$labels['myrights'] = 'Hawliau Mynediad';
+$labels['username'] = 'Defnyddiwr:';
+$labels['advanced'] = 'Modd uwch';
+$labels['newuser'] = 'Ychwanegu cofnod';
+$labels['actions'] = 'Gweithredoedd hawl mynediad...';
+$labels['anyone'] = 'Pob defnyddiwr (unrhywun)';
+$labels['anonymous'] = 'Gwestai (anhysbys)';
+$labels['identifier'] = 'Dynodwr';
+$labels['acll'] = 'Chwilio';
+$labels['shortacll'] = 'Chwilio';
+$labels['aclr'] = 'Darllen negeseuon';
+$labels['acls'] = 'Cadw stad Gwelwyd';
+$labels['aclw'] = 'Fflagiau ysgrifennu';
+$labels['acli'] = 'Mewnosod (Cop簿o fewn i)';
+$labels['aclp'] = 'Postio';
+$labels['shortaclp'] = 'Postio';
+$labels['aclc'] = 'Creu is-ffolderi';
+$labels['aclk'] = 'Creu is-ffolderi';
+$labels['acld'] = 'Dileu negeseuon';
+$labels['aclt'] = 'Dileu negeseuon';
+$labels['acle'] = 'Dileu';
+$labels['shortacle'] = 'Dileu';
+$labels['aclx'] = 'Dileu ffolder';
+$labels['acla'] = 'Gweinyddu';
+$labels['shortacla'] = 'Gweinyddu';
+$labels['aclfull'] = 'Rheolaeth lawn';
+$labels['aclother'] = 'Arall';
+$labels['shortaclother'] = 'Arall';
+$labels['aclread'] = 'Darllen';
+$labels['shortaclr'] = 'Darllen';
+$labels['shortaclread'] = 'Darllen';
+$labels['aclwrite'] = 'Ysgrifennu';
+$labels['shortaclw'] = 'Ysgrifennu';
+$labels['shortaclwrite'] = 'Ysgrifennu';
+$labels['acldelete'] = 'Dileu';
+$labels['shortacld'] = 'Dileu';
+$labels['shortaclt'] = 'Dileu';
+$labels['shortacldelete'] = 'Dileu';
+$labels['shortacls'] = 'Cadw';
+$labels['shortacli'] = 'Mewnosod';
+$labels['shortaclc'] = 'Creu';
+$labels['shortaclk'] = 'Creu';
+$labels['shortaclx'] = 'Dileu ffolder';
+$labels['longacll'] = 'Mae\'r ffolder hwn i\'w weld ar y rhestrau a mae\'n bosib tanysgrifio iddo';
+$labels['longaclr'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
+$labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
+$labels['longacls'] = 'Gellir newid y fflag negeseuon Gwelwyd';
+$labels['longaclw'] = 'Gellir newid y fflagiau negeseuon a allweddeiriau, heblaw Gwelwyd a Dil禱uwyd';
+$labels['longacli'] = 'Gellir ysgrifennu neu cop簿o negeseuon i\'r ffolder';
+$labels['longaclp'] = 'Gellir postio negeseuon i\'r ffolder hwn';
+$labels['longaclc'] = 'Gellir creu (neu ail-enwi) ffolderi yn uniongyrchol o dan y ffolder hwn';
+$labels['longaclk'] = 'Gellir creu (neu ail-enwi) ffolderi yn uniongyrchol o dan y ffolder hwn';
+$labels['longacld'] = 'Gellir newid fflag neges Dileu';
+$labels['longaclt'] = 'Gellir newid fflag neges Dileu';
+$labels['longacle'] = 'Gellir gwaredu negeseuon';
+$labels['longaclx'] = 'Gellir dileu neu ail-enwi\'r ffolder';
+$labels['longacla'] = 'Gellir newid hawliau mynediad y ffolder';
+$labels['longaclfull'] = 'Rheolaeth lawn yn cynnwys rheolaeth ffolderi';
+$labels['longaclwrite'] = 'Gellir nodi, ysgrifennu neu cop簿o negeseuon i\'r ffolder';
+$labels['longacldelete'] = 'Gellir dileu negeseuon';
+$labels['deleting'] = 'Yn dileu hawliau mynediad...';
+$labels['saving'] = 'Yn cadw hawliau mynediad...';
+$labels['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
+$labels['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
+$labels['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
+$labels['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
+$labels['deleteerror'] = 'Methwyd dileu hawliau mynediad';
+$labels['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
+$labels['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
+$labels['norights'] = 'Nid oes hawliau wedi eu nodi!';
+$labels['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
+
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
new file mode 100644
index 000000000..c3006743c
--- /dev/null
+++ b/plugins/acl/localization/da_DK.inc
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Johannes Hessellund <osos@openeyes.dk>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Deling';
+$labels['myrights'] = 'Adgangrettigheder';
+$labels['username'] = 'Bruger:';
+$labels['advanced'] = 'avanceret mode';
+$labels['newuser'] = 'Tilf繪j indgang';
+$labels['anyone'] = 'Alle brugere';
+$labels['anonymous'] = 'G疆st (anonym)';
+$labels['identifier'] = 'Identifikator';
+$labels['acll'] = 'Sl疇 op';
+$labels['shortacll'] = 'Sl疇 op';
+$labels['aclr'] = 'L疆s beskeder';
+$labels['acls'] = 'Behold l疆st-status';
+$labels['aclw'] = 'Skriv flag';
+$labels['acli'] = 'Inds疆t (kopier ind i)';
+$labels['aclp'] = 'Send';
+$labels['shortaclp'] = 'Send';
+$labels['aclc'] = 'Opret undermapper';
+$labels['aclk'] = 'Opret undermapper';
+$labels['acld'] = 'Slet beskeder';
+$labels['aclt'] = 'Slet beskeder';
+$labels['acle'] = 'Udslet';
+$labels['shortacle'] = 'Udslet';
+$labels['aclx'] = 'Slet mappe';
+$labels['acla'] = 'Administrer';
+$labels['shortacla'] = 'Administrer';
+$labels['aclfull'] = 'Fuld kontrol';
+$labels['aclother'] = 'Andet';
+$labels['shortaclother'] = 'Andet';
+$labels['aclread'] = 'L疆se';
+$labels['shortaclr'] = 'L疆se';
+$labels['shortaclread'] = 'L疆se';
+$labels['aclwrite'] = 'Skrive';
+$labels['shortaclw'] = 'Skrive';
+$labels['shortaclwrite'] = 'Skrive';
+$labels['acldelete'] = 'Slet';
+$labels['shortacld'] = 'Slet';
+$labels['shortaclt'] = 'Slet';
+$labels['shortacldelete'] = 'Slet';
+$labels['shortacls'] = 'Behold';
+$labels['shortacli'] = 'Inds疆t';
+$labels['shortaclc'] = 'Opret';
+$labels['shortaclk'] = 'Opret';
+$labels['shortaclx'] = 'Slet mappe';
+$labels['longacll'] = 'Mappen er synlig p疇 listen og kan abonneres p疇';
+$labels['longaclr'] = 'Mappen kan 疇bnes for l疆sning';
+$labels['longaclread'] = 'Mappen kan 疇bnes for l疆sning';
+$labels['longacls'] = 'Beskeders L疆st-flag kan 疆ndres';
+$labels['longacli'] = 'Beskeder kan blive skrevet eller kopieret til mappen';
+$labels['longaclp'] = 'Beskeder kan sendes til denne mappe';
+$labels['longaclc'] = 'Mapper kan blive oprettet (eller omd繪bt) direkte under denne mappe';
+$labels['longaclk'] = 'Mapper kan blive oprettet (eller omd繪bt) direkte under denne mappe';
+$labels['longacld'] = 'Beskeders Slet-flag kan 疆ndres';
+$labels['longaclt'] = 'Beskeders Slet-flag kan 疆ndres';
+$labels['longacle'] = 'Beskeder kan slettes';
+$labels['longaclx'] = 'Mappen kan blive slettet eller omd繪bt';
+$labels['longacla'] = 'Mappen adgangsrettigheder kan 疆ndres';
+
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
new file mode 100644
index 000000000..f90404d19
--- /dev/null
+++ b/plugins/acl/localization/de_CH.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Freigabe';
+$labels['myrights'] = 'Zugriffsrechte';
+$labels['username'] = 'Benutzer:';
+$labels['advanced'] = 'erweiterter Modus';
+$labels['newuser'] = 'Eintrag hinzuf羹gen';
+$labels['actions'] = 'Zugriffsrechte Aktionen...';
+$labels['anyone'] = 'Alle Benutzer (anyone)';
+$labels['anonymous'] = 'G瓣ste (anonymous)';
+$labels['identifier'] = 'Bezeichnung';
+$labels['acll'] = 'Sichtbar';
+$labels['shortacll'] = 'Sichtbar';
+$labels['aclr'] = 'Nachrichten lesen';
+$labels['acls'] = 'Lesestatus 瓣ndern';
+$labels['aclw'] = 'Flags schreiben';
+$labels['acli'] = 'Nachrichten hinzuf羹gen';
+$labels['aclp'] = 'Senden an';
+$labels['shortaclp'] = 'Senden an';
+$labels['aclc'] = 'Unterordner erstellen';
+$labels['aclk'] = 'Unterordner erstellen';
+$labels['acld'] = 'Nachrichten als gel繹scht markieren';
+$labels['aclt'] = 'Nachrichten als gel繹scht markieren';
+$labels['acle'] = 'Endg羹ltig l繹schen';
+$labels['shortacle'] = 'Endg羹ltig l繹schen';
+$labels['aclx'] = 'Ordner l繹schen';
+$labels['acla'] = 'Verwalten';
+$labels['shortacla'] = 'Verwalten';
+$labels['aclfull'] = 'Vollzugriff';
+$labels['aclother'] = 'Andere';
+$labels['shortaclother'] = 'Andere';
+$labels['aclread'] = 'Lesen';
+$labels['shortaclr'] = 'Lesen';
+$labels['shortaclread'] = 'Lesen';
+$labels['aclwrite'] = 'Schreiben';
+$labels['shortaclw'] = 'Schreiben';
+$labels['shortaclwrite'] = 'Schreiben';
+$labels['acldelete'] = 'L繹schen';
+$labels['shortacld'] = 'L繹schen';
+$labels['shortaclt'] = 'L繹schen';
+$labels['shortacldelete'] = 'L繹schen';
+$labels['shortacls'] = 'Behalte';
+$labels['shortacli'] = 'Hinzuf羹gen';
+$labels['shortaclc'] = 'Erstellen';
+$labels['shortaclk'] = 'Erstellen';
+$labels['shortaclx'] = 'Ordner l繹schen';
+$labels['longacll'] = 'Der Ordner ist sichtbar und kann abonniert werden';
+$labels['longaclr'] = 'Der Ordnerinhalt kann gelesen werden';
+$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
+$labels['longacls'] = 'Der Lesestatus von Nachrichten kann ge瓣ndert werden';
+$labels['longaclw'] = 'Alle Nachrichten-Flags und Schl羹sselw繹rter ausser "Gelesen" und "Gel繹scht" k繹nnen ge瓣ndert werden';
+$labels['longacli'] = 'Nachrichten k繹nnen in diesen Ordner kopiert oder verschoben werden';
+$labels['longaclp'] = 'Nachrichten k繹nnen an diesen Ordner gesendet werden';
+$labels['longaclc'] = 'Unterordner k繹nnen in diesem Ordner erstellt oder umbenannt werden';
+$labels['longaclk'] = 'Unterordner k繹nnen in diesem Ordner erstellt oder umbenannt werden';
+$labels['longacld'] = 'Der "gel繹scht" Status von Nachrichten kann ge瓣ndert werden';
+$labels['longaclt'] = 'Der "gel繹scht" Status von Nachrichten kann ge瓣ndert werden';
+$labels['longacle'] = 'Als "gel繹scht" markierte Nachrichten k繹nnen entfernt werden';
+$labels['longaclx'] = 'Der Ordner kann gel繹scht oder umbenannt werden';
+$labels['longacla'] = 'Die Zugriffsrechte des Ordners k繹nnen ge瓣ndert werden';
+$labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
+$labels['longaclwrite'] = 'Nachrichten k繹nnen markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
+$labels['longacldelete'] = 'Nachrichten k繹nnen gel繹scht werden';
+$labels['deleting'] = 'Zugriffsrechte werden entzogen...';
+$labels['saving'] = 'Zugriffsrechte werden gespeichert...';
+$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich ge瓣ndert';
+$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$labels['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugef羹gt';
+$labels['updateerror'] = 'Zugriffsrechte konnten nicht ge瓣ndert werden';
+$labels['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
+$labels['createerror'] = 'Zugriffsrechte konnten nicht gew瓣hrt werden';
+$labels['deleteconfirm'] = 'Sind Sie sicher, dass Sie die Zugriffsrechte den ausgew瓣hlten Benutzern entziehen m繹chten?';
+$labels['norights'] = 'Es wurden keine Zugriffsrechte ausgew瓣hlt!';
+$labels['nouser'] = 'Es wurde kein Benutzer ausgew瓣hlt!';
+
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index 92c7e4290..cfb685c73 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
@@ -9,48 +23,44 @@ $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'G瓣ste (anonymous)';
 $labels['identifier'] = 'Bezeichnung';
-
-$labels['acll'] = 'Ordner sichtbar';
+$labels['acll'] = 'Sichtbar';
+$labels['shortacll'] = 'Sichtbar';
 $labels['aclr'] = 'Nachrichten lesen';
 $labels['acls'] = 'Lesestatus 瓣ndern';
 $labels['aclw'] = 'Flags schreiben';
 $labels['acli'] = 'Nachrichten Hinzuf羹gen';
-$labels['aclp'] = 'Nachrichten Senden an';
+$labels['aclp'] = 'Senden an';
+$labels['shortaclp'] = 'Senden an';
 $labels['aclc'] = 'Unterordner erstellen';
 $labels['aclk'] = 'Unterordner erstellen';
 $labels['acld'] = 'Nachrichten als gel繹scht markieren';
 $labels['aclt'] = 'Nachrichten als gel繹scht markieren';
-$labels['acle'] = 'Nachrichten endg羹ltig L繹schen';
+$labels['acle'] = 'endg羹ltig l繹schen';
+$labels['shortacle'] = 'endg羹ltig l繹schen';
 $labels['aclx'] = 'Ordner l繹schen';
-$labels['acla'] = 'Zugriffsrechte Verwalten';
-
+$labels['acla'] = 'Verwalten';
+$labels['shortacla'] = 'Verwalten';
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
+$labels['shortaclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
+$labels['shortaclr'] = 'Lesen';
+$labels['shortaclread'] = 'Lesen';
 $labels['aclwrite'] = 'Schreiben';
+$labels['shortaclw'] = 'Schreiben';
+$labels['shortaclwrite'] = 'Schreiben';
 $labels['acldelete'] = 'L繹schen';
-
-$labels['shortacll'] = 'Sichtbar';
-$labels['shortaclr'] = 'Lesen';
+$labels['shortacld'] = 'L繹schen';
+$labels['shortaclt'] = 'L繹schen';
+$labels['shortacldelete'] = 'L繹schen';
 $labels['shortacls'] = 'Lesestatus';
-$labels['shortaclw'] = 'Flags 瓣ndern';
 $labels['shortacli'] = 'Hinzuf羹gen';
-$labels['shortaclp'] = 'Senden an';
 $labels['shortaclc'] = 'Erstellen';
 $labels['shortaclk'] = 'Erstellen';
-$labels['shortacld'] = 'L繹schen';
-$labels['shortaclt'] = 'L繹schen';
-$labels['shortacle'] = 'endg羹ltig l繹schen';
 $labels['shortaclx'] = 'Ordner l繹schen';
-$labels['shortacla'] = 'Verwalten';
-
-$labels['shortaclother'] = 'Andere';
-$labels['shortaclread'] = 'Lesen';
-$labels['shortaclwrite'] = 'Schreiben';
-$labels['shortacldelete'] = 'L繹schen';
-
 $labels['longacll'] = 'Der Ordner ist sichtbar und kann abonniert werden';
-$labels['longaclr'] = 'Nachrichten im Ordner k繹nnen gelesen werden';
+$labels['longaclr'] = 'Der Ordnerinhalt kann gelesen werden';
+$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longacls'] = 'Der Lesestatus von Nachrichten kann ge瓣ndert werden';
 $labels['longaclw'] = 'Alle Nachrichten-Flags und Schl羹sselw繹rter au��er "Gelesen" und "Gel繹scht" k繹nnen ge瓣ndert werden';
 $labels['longacli'] = 'Nachrichten k繹nnen in diesen Ordner kopiert oder verschoben werden';
@@ -62,22 +72,18 @@ $labels['longaclt'] = 'Der "gel繹scht" Status von Nachrichten kann ge瓣ndert wer
 $labels['longacle'] = 'Als "gel繹scht" markiert Nachrichten k繹nnen gel繹scht werden.';
 $labels['longaclx'] = 'Der Ordner kann gel繹scht oder umbenannt werden';
 $labels['longacla'] = 'Die Zugriffsrechte des Ordners k繹nnen ge瓣ndert werden';
-
 $labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
-$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longaclwrite'] = 'Nachrichten k繹nnen markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
 $labels['longacldelete'] = 'Nachrichten k繹nnen gel繹scht werden';
+$labels['deleting'] = 'Zugriffsrechte werden entzogen...';
+$labels['saving'] = 'Zugriffsrechte werden gew瓣hrt...';
+$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich ge瓣ndert';
+$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$labels['createsuccess'] = 'Zugriffsrechte erfolgreich gew瓣hrt';
+$labels['updateerror'] = 'Zugriffsrechte konnten nicht ge瓣ndert werden';
+$labels['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
+$labels['createerror'] = 'Zugriffsrechte konnten nicht gew瓣hrt werden';
+$labels['deleteconfirm'] = 'Sind Sie sicher, da�� Sie die Zugriffsrechte den ausgew瓣hlten Benutzern entziehen m繹chten?';
+$labels['norights'] = 'Es wurden keine Zugriffsrechte ausgew瓣hlt!';
+$labels['nouser'] = 'Es wurde kein Benutzer ausgew瓣hlt!';
 
-$messages['deleting'] = 'Zugriffsrechte werden entzogen...';
-$messages['saving'] = 'Zugriffsrechte werden gew瓣hrt...';
-$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich ge瓣ndert';
-$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
-$messages['createsuccess'] = 'Zugriffsrechte erfolgreich gew瓣hrt';
-$messages['updateerror'] = 'Zugriffsrechte konnten nicht ge瓣ndert werden';
-$messages['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
-$messages['createerror'] = 'Zugriffsrechte konnten nicht gew瓣hrt werden';
-$messages['deleteconfirm'] = 'Sind Sie sicher, da�� Sie die Zugriffsrechte den ausgew瓣hlten Benutzern entziehen m繹chten?';
-$messages['norights'] = 'Es wurden keine Zugriffsrechte ausgew瓣hlt!';
-$messages['nouser'] = 'Es wurde kein Benutzer ausgew瓣hlt!';
-
-?>
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
new file mode 100644
index 000000000..201cb3c0b
--- /dev/null
+++ b/plugins/acl/localization/en_GB.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Lazlo                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Sharing';
+$labels['myrights'] = 'Access Rights';
+$labels['username'] = 'User:';
+$labels['advanced'] = 'advanced mode';
+$labels['newuser'] = 'Add entry';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$labels['anonymous'] = 'Guests (anonymous)';
+$labels['identifier'] = 'Identifier';
+$labels['acll'] = 'Look-up';
+$labels['shortacll'] = 'Look-up';
+$labels['aclr'] = 'Read messages';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (copy into)';
+$labels['aclp'] = 'Post';
+$labels['shortaclp'] = 'Post';
+$labels['aclc'] = 'Create sub-folders';
+$labels['aclk'] = 'Create sub-folders';
+$labels['acld'] = 'Delete messages';
+$labels['aclt'] = 'Delete messages';
+$labels['acle'] = 'Expunge';
+$labels['shortacle'] = 'Expunge';
+$labels['aclx'] = 'Delete folder';
+$labels['acla'] = 'Administer';
+$labels['shortacla'] = 'Administer';
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['shortaclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['shortaclr'] = 'Read';
+$labels['shortaclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['shortaclw'] = 'Write';
+$labels['shortaclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacldelete'] = 'Delete';
+$labels['shortacls'] = 'Keep';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortaclx'] = 'Folder delete';
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to.';
+$labels['longaclr'] = 'The folder can be opened for reading';
+$labels['longaclread'] = 'The folder can be opened for reading';
+$labels['longacls'] = 'Messages Seen flag can be changed';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted.';
+$labels['longacli'] = 'Messages can be written or copied to the folder';
+$labels['longaclp'] = 'Messages can be posted to this folder';
+$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
+$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
+$labels['longacld'] = 'Messages Delete flag can be changed';
+$labels['longaclt'] = 'Messages Delete flag can be changed';
+$labels['longacle'] = 'Messages can be expunged';
+$labels['longaclx'] = 'The folder can be deleted or renamed';
+$labels['longacla'] = 'The folder access rights can be changed';
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+$labels['deleting'] = 'Deleting access rights...';
+$labels['saving'] = 'Saving access rights...';
+$labels['updatesuccess'] = 'Successfully changed access rights';
+$labels['deletesuccess'] = 'Successfully deleted access rights';
+$labels['createsuccess'] = 'Successfully added access rights';
+$labels['updateerror'] = 'Ubable to update access rights';
+$labels['deleteerror'] = 'Unable to delete access rights';
+$labels['createerror'] = 'Unable to add access rights';
+$labels['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$labels['norights'] = 'No rights has been specified!';
+$labels['nouser'] = 'No username has been specified!';
+
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
new file mode 100644
index 000000000..a95dcc589
--- /dev/null
+++ b/plugins/acl/localization/es_ES.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: pompilos <ciordia@gmail.com>                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Compartir';
+$labels['myrights'] = 'Permisos de acceso';
+$labels['username'] = 'Usuario:';
+$labels['advanced'] = 'Modo avanzado';
+$labels['newuser'] = 'A簽adir una entrada';
+$labels['actions'] = 'Acciones sobre los permisos de acceso���';
+$labels['anyone'] = 'Todos los usuarios (cualquiera)';
+$labels['anonymous'] = 'Invitados (an籀nimo)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'B繳squeda';
+$labels['shortacll'] = 'B繳squeda';
+$labels['aclr'] = 'Leer mensajes';
+$labels['acls'] = 'Mantener como "Le穩do';
+$labels['aclw'] = 'Escribir etiquetas';
+$labels['acli'] = 'Insertar (Copiar dentro)';
+$labels['aclp'] = 'Enviar';
+$labels['shortaclp'] = 'Enviar';
+$labels['aclc'] = 'Crear subcarpetas';
+$labels['aclk'] = 'Crear subcarpetas';
+$labels['acld'] = 'Borrar mensajes';
+$labels['aclt'] = 'Borrar mensajes';
+$labels['acle'] = 'Expurgar';
+$labels['shortacle'] = 'Expurgar';
+$labels['aclx'] = 'Borrar carpeta';
+$labels['acla'] = 'Administrar';
+$labels['shortacla'] = 'Administrar';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Otro';
+$labels['shortaclother'] = 'Otro';
+$labels['aclread'] = 'Leer';
+$labels['shortaclr'] = 'Leer';
+$labels['shortaclread'] = 'Leer';
+$labels['aclwrite'] = 'Escribir';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['acldelete'] = 'Borrar';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
+$labels['shortacldelete'] = 'Borrar';
+$labels['shortacls'] = 'Conservar';
+$labels['shortacli'] = 'Insertar';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortaclx'] = 'Borrar carpeta';
+$labels['longacll'] = 'La carpeta es visible en las listas y es posible suscribirse a ella';
+$labels['longaclr'] = 'Se puede abrir la carpeta para leer';
+$labels['longaclread'] = 'Se puede abrir la carpeta para leer';
+$labels['longacls'] = 'Se pueden cambiar los mensajes con la etiqueta "Le穩do';
+$labels['longaclw'] = 'Las etiquetas de mensaje y las palabras clave se pueden cambiar, excepto "Le穩do" y "Borrado';
+$labels['longacli'] = 'Se pueden escribir mensajes o copiarlos a la carpeta';
+$labels['longaclp'] = 'Se pueden enviar mensajes a esta carpeta';
+$labels['longaclc'] = 'Se pueden crear (o renombrar) carpetas directamente bajo esta carpeta';
+$labels['longaclk'] = 'Se pueden crear (o renombrar) carpetas directamente bajo esta carpeta';
+$labels['longacld'] = 'No se pueden cambiar los mensajes etiquetados como "Borrado';
+$labels['longaclt'] = 'No se pueden cambiar los mensajes etiquetados como "Borrado';
+$labels['longacle'] = 'No se pueden expurgar los mensajes';
+$labels['longaclx'] = 'La carpeta se puede borrar o renombrar';
+$labels['longacla'] = 'Se pueden cambiar los permisos de acceso';
+$labels['longaclfull'] = 'Control total, incluyendo la gesti籀n de carpetas';
+$labels['longaclwrite'] = 'Se pueden etiquetar, escribir o copiar mensajes a la carpeta';
+$labels['longacldelete'] = 'Los mensajes se pueden borrar';
+$labels['deleting'] = 'Borrando permisos de acceso���';
+$labels['saving'] = 'Guardando permisos de acceso���';
+$labels['updatesuccess'] = 'Se han cambiado los permisos de acceso';
+$labels['deletesuccess'] = 'Se han borrado los permisos de acceso';
+$labels['createsuccess'] = 'Se han a簽adido los permisos de acceso';
+$labels['updateerror'] = 'No se han podido actualizar los permisos de acceso';
+$labels['deleteerror'] = 'No se han podido borrar los permisos de acceso';
+$labels['createerror'] = 'No se han podido a簽adir los permisos de acceso';
+$labels['deleteconfirm'] = '聶Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
+$labels['norights'] = 'No se han especificado los permisos de acceso';
+$labels['nouser'] = 'No se ha especificado un nombre de usuario';
+
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
new file mode 100644
index 000000000..a13102300
--- /dev/null
+++ b/plugins/acl/localization/fa_IR.inc
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_IR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hamid <abbaszadeh.h@gmail.com>                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '塈奡堛堭塈琠���痧堸塈堭��';
+$labels['myrights'] = '��堿��堬��塈�� 堹堻堛堭堻��';
+$labels['username'] = '琠塈堭堥堭:';
+$labels['advanced'] = '堶塈��堛 椈��奡堭��堛��';
+$labels['identifier'] = '奡��塈堻塈痧堭';
+$labels['aclr'] = '椈��塈�� ��塈�� 堮��塈��堹�� 奡堹��';
+$labels['aclp'] = '����奡堛��';
+$labels['shortaclp'] = '����奡堛��';
+$labels['aclx'] = '堶堸�� 椈��奡��';
+$labels['acla'] = '��堹��堭';
+$labels['shortacla'] = '��堹��堭';
+$labels['aclfull'] = '琠��堛堭�� 琠塈����';
+$labels['aclother'] = '堹��痧堭';
+$labels['shortaclother'] = '堹��痧堭';
+$labels['aclread'] = '堮��塈��堹�� 奡堹��';
+$labels['shortaclr'] = '堮��塈��堹�� 奡堹��';
+$labels['shortaclread'] = '堮��塈��堹�� 奡堹��';
+$labels['aclwrite'] = '����奡堛��';
+$labels['shortaclw'] = '����奡堛��';
+$labels['shortaclwrite'] = '����奡堛��';
+$labels['acldelete'] = '堶堸��';
+$labels['shortacld'] = '堶堸��';
+$labels['shortaclt'] = '堶堸��';
+$labels['shortacldelete'] = '堶堸��';
+$labels['shortacls'] = '��痧�� 堹塈奡堛��';
+$labels['shortacli'] = '堿塈痧堸塈堭��';
+$labels['shortaclc'] = '塈��堿塈堹';
+$labels['shortaclk'] = '塈��堿塈堹';
+
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
new file mode 100644
index 000000000..7af5b3e26
--- /dev/null
+++ b/plugins/acl/localization/fi_FI.inc
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Gr繹nroos                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Jakaminen';
+$labels['myrights'] = 'K瓣ytt繹oikeudet';
+$labels['username'] = 'K瓣ytt瓣j瓣:';
+$labels['advanced'] = 'edistynyt tila';
+$labels['anyone'] = 'Kaikki k瓣ytt瓣j瓣t (kuka tahansa)';
+$labels['anonymous'] = 'Vieraat (anonyymit)';
+$labels['aclr'] = 'Lue viestej瓣';
+$labels['aclc'] = 'Luo alikansioita';
+$labels['aclk'] = 'Luo alikansioita';
+$labels['acld'] = 'Poista viestej瓣';
+$labels['aclt'] = 'Poista viestej瓣';
+$labels['aclx'] = 'Poista kansio';
+$labels['aclfull'] = 'T瓣ysi hallinta';
+$labels['aclother'] = 'Muu';
+$labels['shortaclother'] = 'Muu';
+$labels['aclread'] = 'Luku';
+$labels['shortaclr'] = 'Luku';
+$labels['shortaclread'] = 'Luku';
+$labels['aclwrite'] = 'Kirjoitus';
+$labels['shortaclw'] = 'Kirjoitus';
+$labels['shortaclwrite'] = 'Kirjoitus';
+$labels['acldelete'] = 'Poisto';
+$labels['shortacld'] = 'Poisto';
+$labels['shortaclt'] = 'Poisto';
+$labels['shortacldelete'] = 'Poisto';
+$labels['shortaclc'] = 'Luo';
+$labels['shortaclk'] = 'Luo';
+$labels['longaclr'] = 'Kansio voidaan avata lukua varten';
+$labels['longaclread'] = 'Kansio voidaan avata lukua varten';
+$labels['longaclc'] = 'Kansioita voi luoda (tai nimet瓣 uudelleen) t瓣m瓣n kansion alla';
+$labels['longaclk'] = 'Kansioita voi luoda (tai nimet瓣 uudelleen) t瓣m瓣n kansion alla';
+$labels['longaclx'] = 'Kansion voi poistaa tai nimet瓣 uudelleen';
+$labels['longacla'] = 'Kansion k瓣ytt繹oikeuksia voi muuttaa';
+$labels['longaclfull'] = 'T瓣ysi hallinta mukaan lukien kansioiden yll瓣pidon';
+$labels['longacldelete'] = 'Viestej瓣 voi poistaa';
+$labels['deleting'] = 'Poistetaan k瓣ytt繹oikeuksia...';
+$labels['saving'] = 'Tallennetaan k瓣ytt繹oikeuksia...';
+$labels['updatesuccess'] = 'K瓣ytt繹oikeudet on muutettu onnistuneesti';
+$labels['deletesuccess'] = 'K瓣ytt繹oikeudet on poistettu onnistuneesti';
+$labels['createsuccess'] = 'K瓣ytt繹oikeudet on lis瓣tty onnistuneesti';
+$labels['deleteerror'] = 'K瓣ytt繹oikeuksien poisto ep瓣onnistui';
+$labels['createerror'] = 'K瓣ytt繹oikeuksien lis瓣ys ep瓣onnistui';
+$labels['norights'] = 'K瓣ytt繹oikeuksia ei ole m瓣瓣ritelty!';
+$labels['nouser'] = 'K瓣ytt瓣j瓣tunnusta ei ole m瓣瓣ritelty!';
+
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
new file mode 100644
index 000000000..e4239dc46
--- /dev/null
+++ b/plugins/acl/localization/fr_FR.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Tr4sK                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Partage';
+$labels['myrights'] = 'Droits d\'acc癡s';
+$labels['username'] = 'Utilisateur��:';
+$labels['advanced'] = 'Mode avanc矇';
+$labels['newuser'] = 'Ajouter l\'entr矇e';
+$labels['actions'] = 'Action sur les droits d\'acc癡s...';
+$labels['anyone'] = 'Tous les utilisateurs (tout le monde)';
+$labels['anonymous'] = 'Invit矇s (anonymes)';
+$labels['identifier'] = 'Identifiant';
+$labels['acll'] = 'Consultation';
+$labels['shortacll'] = 'Consultation';
+$labels['aclr'] = 'Lire les messages';
+$labels['acls'] = 'Garder l\'矇tat vu';
+$labels['aclw'] = '��crire une 矇tiquette';
+$labels['acli'] = 'Ins矇rer (Copier dans)';
+$labels['aclp'] = 'Envoyer';
+$labels['shortaclp'] = 'Envoyer';
+$labels['aclc'] = 'Cr矇er des sous-dossiers';
+$labels['aclk'] = 'Cr矇er des sous-dossiers';
+$labels['acld'] = 'Supprimer des messages';
+$labels['aclt'] = 'Supprimer des messages';
+$labels['acle'] = 'Purger';
+$labels['shortacle'] = 'Purger';
+$labels['aclx'] = 'Supprimer un dossier';
+$labels['acla'] = 'Administrer';
+$labels['shortacla'] = 'Administrer';
+$labels['aclfull'] = 'Contr繫le total';
+$labels['aclother'] = 'Autre';
+$labels['shortaclother'] = 'Autre';
+$labels['aclread'] = 'Lecture';
+$labels['shortaclr'] = 'Lecture';
+$labels['shortaclread'] = 'Lecture';
+$labels['aclwrite'] = '��criture';
+$labels['shortaclw'] = '��criture';
+$labels['shortaclwrite'] = '��criture';
+$labels['acldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacls'] = 'Conserver';
+$labels['shortacli'] = 'Ins矇rer';
+$labels['shortaclc'] = 'Cr矇er';
+$labels['shortaclk'] = 'Cr矇er';
+$labels['shortaclx'] = 'Supprimer un dossier';
+$labels['longacll'] = 'Ce dossier est visible dans les listes et peut 礙tre souscrit';
+$labels['longaclr'] = 'Le dossier peut-礙tre ouvert pour lecture';
+$labels['longaclread'] = 'Le dossier peut-礙tre ouvert pour lecture';
+$labels['longacls'] = 'L\'矇tiquette Lu peut-礙tre chang矇e';
+$labels['longaclw'] = 'Les 矇tiquettes et les mot-cl矇s peuvent-礙tre chang矇, sauf pour Vu et Supprim矇';
+$labels['longacli'] = 'Les messages peuvent-礙tre 矇crit ou copi矇 dans le dossier';
+$labels['longaclp'] = 'Les messages peuvent-礙tre envoy矇 dans ce dossier';
+$labels['longaclc'] = 'Les dossiers peuvent-礙tre cr矇er (ou renommer) directement depuis ce dossier';
+$labels['longaclk'] = 'Les dossiers peuvent-礙tre cr矇er (ou renommer) directement depuis ce dossier';
+$labels['longacld'] = 'L\'矇tiquette de suppression des messages peut-礙tre modifi矇e';
+$labels['longaclt'] = 'L\'矇tiquette de suppression des messages peut-礙tre modifi矇e';
+$labels['longacle'] = 'Les messages peuvent-礙tre purg矇s';
+$labels['longaclx'] = 'Le dossier peut-礙tre supprim矇 ou renomm矇';
+$labels['longacla'] = 'Les droits d\'acc癡s au dossier peuvent-礙tre modifi矇s';
+$labels['longaclfull'] = 'Contr繫le total, dossier d\'administration inclus';
+$labels['longaclwrite'] = 'Les messages peuvent-礙tre marqu矇, 矇crit ou copi矇 dans ce dossier';
+$labels['longacldelete'] = 'Les messages peuvent-礙tre supprim矇';
+$labels['deleting'] = 'Suppression des droits d\'acc癡s���';
+$labels['saving'] = 'Sauvegarde des droits d\'acc癡s���';
+$labels['updatesuccess'] = 'Les droits d\'acc癡s ont 矇t矇 chang矇 avec succ癡s';
+$labels['deletesuccess'] = 'Les droits d\'acc癡s ont 矇t矇 supprim矇 avec succ癡s';
+$labels['createsuccess'] = 'Les droits d\'acc癡s ont 矇t矇 ajout矇 avec succ癡s';
+$labels['updateerror'] = 'Impossible de mettre �� jour les droits d\'acc癡s';
+$labels['deleteerror'] = 'Impossible de supprimer les droits d\'acc癡s';
+$labels['createerror'] = 'Impossible d\'ajouter des droits d\'acc癡s';
+$labels['deleteconfirm'] = '��tes-vous s羶r de vouloir retirer les droits d\'acc癡s du/des utilisateur(s) s矇lectionn矇��?';
+$labels['norights'] = 'Aucun droit n\'a 矇t矇 sp矇cifi矇��!';
+$labels['nouser'] = 'Aucun nom d\'utilisateur n\'a 矇t矇 sp矇cifi矇��!';
+
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
new file mode 100644
index 000000000..83b3f8292
--- /dev/null
+++ b/plugins/acl/localization/he_IL.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '蚸��蛌��蛅';
+$labels['myrights'] = '����������蛌 ����蚸��';
+$labels['username'] = '��蚸蛌��蚸:';
+$labels['advanced'] = '��蛈�� ��蛌蚹����';
+$labels['newuser'] = '����蛂蛅 蛁蚳��';
+$labels['actions'] = '蚺蛁������蛌 蛁�� ����������蛌 ����蚸��...';
+$labels['anyone'] = '���� ����蚸蛌��蚸���� (���� ������)';
+$labels['anonymous'] = '����蚳������ (��������������)';
+$labels['identifier'] = '��������';
+$labels['acll'] = '����蚺��蚸';
+$labels['shortacll'] = '����蚺��蚸';
+$labels['aclr'] = '蚹蚳����蛌 ������蛁��蛌';
+$labels['acls'] = '蚸����蚳�� 蛁�� 蛂������蛂 ��蚳����';
+$labels['aclw'] = '�������� ��蛌������';
+$labels['acli'] = '����蛂蚺�� ������ 蛁蚳������ (��蛁蛌蚹�� ��蛌����)';
+$labels['aclp'] = '蚺蚳蛂����';
+$labels['shortaclp'] = '蚺蚳蛂����';
+$labels['aclc'] = '��蛈��蚳蛌 蛌蛌祩蛌��蚹����蛌';
+$labels['aclk'] = '��蛈��蚳蛌 蛌蛌祩蛌��蚹����蛌';
+$labels['acld'] = '������蚹蛌 ������蛁��蛌';
+$labels['aclt'] = '������蚹蛌 ������蛁��蛌';
+$labels['acle'] = '����蚹���� 蚳蚸������蛌 蚸����������';
+$labels['shortacle'] = '����蚹���� 蚳蚸������蛌 蚸����������';
+$labels['aclx'] = '������蚹蛌 蛌��蚹����';
+$labels['acla'] = '��������';
+$labels['shortacla'] = '��������';
+$labels['aclfull'] = '蚸�������� ��������';
+$labels['aclother'] = '����蚳';
+$labels['shortaclother'] = '����蚳';
+$labels['aclread'] = '蚹蚳������';
+$labels['shortaclr'] = '蚹蚳������';
+$labels['shortaclread'] = '蚹蚳������';
+$labels['aclwrite'] = '��蛌������';
+$labels['shortaclw'] = '��蛌������';
+$labels['shortaclwrite'] = '��蛌������';
+$labels['acldelete'] = '������蚹��';
+$labels['shortacld'] = '������蚹��';
+$labels['shortaclt'] = '������蚹��';
+$labels['shortacldelete'] = '������蚹��';
+$labels['shortacls'] = '����蚸����蚳';
+$labels['shortacli'] = '����蛂蚺�� ������ 蛁蚳������';
+$labels['shortaclc'] = '��蛈��蚳��';
+$labels['shortaclk'] = '��蛈��蚳��';
+$labels['shortaclx'] = '������蚹蛌 蛌��蚹����';
+$labels['longacll'] = '��蛌��蚹���� 蛌蚳���� ��蚳蚸������蛌 ������蛌�� �������� ����蚳蚸�� ��������';
+$labels['longaclr'] = '����蛌�� ��蚺蛌���� ��蛌 ��蛌��蚹���� ����蚹蚳���� ����';
+$labels['longaclread'] = '����蛌�� ��蚺蛌���� ��蛌 ��蛌��蚹���� ����蚹蚳���� ����';
+$labels['longacls'] = '����蛌�� ��蚸����蛌 ������ ��蚳���� ��������蛁��蛌';
+$labels['longaclw'] = '����蛌�� ��蚸����蛌 ���������� ����������蛌 ��蚺蛌�� ��������蛁��蛌, ����蛁�� ��蚳���� ��������蚹';
+$labels['longacli'] = '����蛌�� ����蛌���� ������蛁��蛌 ��蛌��蚹���� ���� ��������蚹��';
+$labels['longaclp'] = '����蛌�� ��蚺蚳蛂�� ������蛁��蛌 ��蛌���� 蛌��蚹���� ����';
+$labels['longaclc'] = '����蛌�� ����蛈��蚳 (���� ��蚸����蛌 蚸��) 蛌��蚹����蛌, ��蚸��蚳��蛌 蛌��蛌 蛌��蚹���� ����';
+$labels['longaclk'] = '����蛌�� ����蛈��蚳 (���� ��蚸����蛌 蚸��) 蛌��蚹����蛌, ��蚸��蚳��蛌 蛌��蛌 蛌��蚹���� ����';
+$labels['longacld'] = '����蛌�� ��蚸����蛌 ������ ������蚹 蚸�� ������蛁��蛌';
+$labels['longaclt'] = '����蛌�� ��蚸����蛌 ������ ������蚹 蚸�� ������蛁��蛌';
+$labels['longacle'] = '����蛌�� ����蚹��蛌 ������蛁��蛌 蚸蛂�������� ��������������蛌';
+$labels['longaclx'] = '����蛌�� ��������蚹 蛌��蚹���� ���� ���� ��蚸����蛌 蚸����';
+$labels['longacla'] = '����蛌�� ��蚸����蛌 ����������蛌 ����蚸�� 蚸�� 蛌��蚹���� ����';
+$labels['longaclfull'] = '蚸�������� �������� �������� ���������� ��蛌��蚹����';
+$labels['longaclwrite'] = '����蛌�� ��蛂����, ����蛌���� ���� ����蛁蛌��蚹 ������蛁��蛌 ��蛌��蚹���� ����';
+$labels['longacldelete'] = '����蛌�� ��������蚹 ������蛁��蛌';
+$labels['deleting'] = '����������蛌 ����蚸�� ������蚹��蛌...';
+$labels['saving'] = '����������蛌 ����蚸�� ��蚸��蚳��蛌...';
+$labels['updatesuccess'] = '����������蛌 ����蚸�� 蚸������ ����蛈������';
+$labels['deletesuccess'] = '����������蛌 ����蚸�� ������蚹�� ����蛈������';
+$labels['createsuccess'] = '����������蛌 ����蚸�� ����蛂蚺�� ����蛈������';
+$labels['updateerror'] = '���� ����蛌�� ��蛁������ ����������蛌 ����蚸��';
+$labels['deleteerror'] = '���� ����蛌�� ��������蚹 ����������蛌 ����蚸��';
+$labels['createerror'] = '���� ����蛌�� ������蛂��蛅 ����������蛌 ����蚸��';
+$labels['deleteconfirm'] = '������ �������� 蚸��蚳蛈������ ����蛂��蚳 ����������蛌 ����蚸�� 蚸�� ����蚸蛌��蚸(����) 蚸������蚳��?';
+$labels['norights'] = '���� 蛈�������� ����������蛌 ����蚸�� ����蚸���� !';
+$labels['nouser'] = '���� 蛈������ 蚸�� ��蚸蛌��蚸 ����蚸����!';
+
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
new file mode 100644
index 000000000..f5ca78fe4
--- /dev/null
+++ b/plugins/acl/localization/hu_HU.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: bela                                                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Megoszt獺s';
+$labels['myrights'] = 'Hozz獺f矇r矇si jogok';
+$labels['username'] = 'Felhaszn獺l籀:';
+$labels['advanced'] = 'Halad籀 be獺ll穩t獺sok';
+$labels['newuser'] = 'Elem hozz獺ad獺sa';
+$labels['actions'] = 'Hozz獺f矇r矇si jogok m羹veletei..';
+$labels['anyone'] = 'Minden felhaszn獺l籀 (b獺rki)';
+$labels['anonymous'] = 'Vend矇gek (n矇vtelen)';
+$labels['identifier'] = 'Azonos穩t籀';
+$labels['acll'] = 'Keres矇s';
+$labels['shortacll'] = 'Keres矇s';
+$labels['aclr'] = '��zenetek olvas獺sa';
+$labels['acls'] = 'Olvasotts獺gi 獺llapot megtart獺sa';
+$labels['aclw'] = '��zenet jel繹l矇se';
+$labels['acli'] = 'Beilleszt矇s (Bem獺sol獺s)';
+$labels['aclp'] = 'Bejegyz矇s';
+$labels['shortaclp'] = 'Bejegyz矇s';
+$labels['aclc'] = 'Almappa l矇trehoz獺s';
+$labels['aclk'] = 'Almappa l矇trehoz獺s';
+$labels['acld'] = '��zenetek t繹rl矇se';
+$labels['aclt'] = '��zenetek t繹rl矇se';
+$labels['acle'] = 'T繹r繹lt 羹zenetek elt獺vol穩t獺sa';
+$labels['shortacle'] = 'T繹r繹lt 羹zenetek elt獺vol穩t獺sa';
+$labels['aclx'] = 'Mappa t繹rl矇s';
+$labels['acla'] = 'Adminisztr獺tor';
+$labels['shortacla'] = 'Adminisztr獺tor';
+$labels['aclfull'] = 'Teljes hozz獺f矇r矇s';
+$labels['aclother'] = 'Egy矇b';
+$labels['shortaclother'] = 'Egy矇b';
+$labels['aclread'] = 'Olvas獺s';
+$labels['shortaclr'] = 'Olvas獺s';
+$labels['shortaclread'] = 'Olvas獺s';
+$labels['aclwrite'] = '��r獺s';
+$labels['shortaclw'] = '��r獺s';
+$labels['shortaclwrite'] = '��r獺s';
+$labels['acldelete'] = 'T繹rl矇s';
+$labels['shortacld'] = 'T繹rl矇s';
+$labels['shortaclt'] = 'T繹rl矇s';
+$labels['shortacldelete'] = 'T繹rl矇s';
+$labels['shortacls'] = 'Megtart獺s';
+$labels['shortacli'] = 'Besz繳r獺s';
+$labels['shortaclc'] = 'L矇trehoz獺s';
+$labels['shortaclk'] = 'L矇trehoz獺s';
+$labels['shortaclx'] = 'Mappa t繹rl矇se';
+$labels['longacll'] = 'A mappa l獺that籀 a list獺n 矇s fel tudsz r獺 iratkozni.';
+$labels['longaclr'] = 'A mappa olvas獺sra megnyithat籀';
+$labels['longaclread'] = 'A mappa olvas獺sra megnyithat籀';
+$labels['longacls'] = 'Az 羹zenet megtekint矇si 獺llapota m籀dos穩that籀';
+$labels['longaclw'] = 'Az 羹zenetek jel繹l矇sei 矇s kulcsszavai m籀dos穩that籀ak, kiv矇ve az olvasotts獺gi 獺llapotot 矇s az 羹zenet t繹r繹lt 獺llapot獺t.';
+$labels['longacli'] = '��zenetek irhat籀ak 矇s m獺olshat籀ak a mapp獺ba.';
+$labels['longaclp'] = 'Ebbe a mapp獺ba tudsz  羹zeneteket tenni.';
+$labels['longaclc'] = 'Mapp獺k l矇trehozhaz籀ak (獺tnevezhet��ek) ez alatt a mappa alatt.';
+$labels['longaclk'] = 'Mapp獺k l矇trehozhaz籀ak (獺tnevezhet��ek) ez alatt a mappa alatt.';
+$labels['longacld'] = '��zenet t繹r繹lve jelz�� m籀dosithat籀.';
+$labels['longaclt'] = '��zenet t繹r繹lve jelz�� m籀dosithat籀.';
+$labels['longacle'] = 'Az 羹zenetek v矇glegesen elt獺vol穩that籀ak';
+$labels['longaclx'] = 'A mappa t繹r繹lhet�� vagy 獺tnevezhet��';
+$labels['longacla'] = 'A mappa hozz獺f矇r矇si jogai m籀dos穩that籀ak';
+$labels['longaclfull'] = 'Teljes hozz獺f矇r矇s bele矇rtve a mapp獺k kezel矇s矇t';
+$labels['longaclwrite'] = 'Az 羹zenetek megjel繹lhet繹k, irhat籀k 矇s m獺solhat籀k ebbe a mapp獺ba';
+$labels['longacldelete'] = 'Az 羹zenetek t繹r繹lhet��ek';
+$labels['deleting'] = 'Hozz獺f矇r矇si jogok t繹rl矇se...';
+$labels['saving'] = 'Hozz獺f矇r矇si jogok ment矇se...';
+$labels['updatesuccess'] = 'A hozz獺f矇r矇si jogok sikeresen m籀dosultak.';
+$labels['deletesuccess'] = 'A hozz獺f矇r矇si jogok t繹rl矇se sikeresen megt繹rt矇nt.';
+$labels['createsuccess'] = 'A hozz獺f矇r矇si jogok hozz獺ad獺sa sikeresen megt繹rt矇nt.';
+$labels['updateerror'] = 'Nem siker羹lt m籀dos穩tani a hozz獺f矇r矇si jogokat.';
+$labels['deleteerror'] = 'Nem siker羹lt t繹r繹lni a hozz獺f矇r矇si jogokat.';
+$labels['createerror'] = 'Nem siker羹lt a hozz獺f矇r矇si jogok hozz獺ad獺sa';
+$labels['deleteconfirm'] = 'Biztosan elt獺vol穩tja a kiv獺lasztott felhaszn獺l籀(k) hozz獺f矇r矇si jogait?';
+$labels['norights'] = 'Nincsennek jogok megadva.';
+$labels['nouser'] = 'A felhaszn獺l籀n矇v nincs megadva.';
+
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
new file mode 100644
index 000000000..86292984a
--- /dev/null
+++ b/plugins/acl/localization/hy_AM.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '埥晛桵桴掍晙';
+$labels['myrights'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��';
+$labels['username'] = '��掁梲捸梲掍��`';
+$labels['advanced'] = '堋梮掑晙捸桮梮桴捸晢 梲捸��掅掍��捸朘';
+$labels['newuser'] = '埜桴掍晙捸��梮掍晙 掁��捸梩楖��桭';
+$labels['actions'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��晛 掁楖��晢楖梐楖��晥桮楖��梮梮掍�����';
+$labels['anyone'] = '埴楖晙楖�� ��掁梲桴楖梐梮掍��旍 (��捸梮朘捸��捸晢)';
+$labels['anonymous'] = '��桮楖����掍��旍 (捸梮捸梮楖��梮)';
+$labels['identifier'] = '��朘捸��捸掁��晛桯';
+$labels['acll'] = '��梮梲��楖��桭';
+$labels['shortacll'] = '��梮梲��楖��桭';
+$labels['aclr'] = '埥捸��掑捸晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
+$labels['acls'] = '��捸桹梣捸梮掍晙 掑晛梲桭捸梮 朘捸��掁捸桴晛梜捸朘旍';
+$labels['aclw'] = '堀��捸梩桭捸梮 梮梫楖��桭梮掍��';
+$labels['acli'] = '��掍��掑梮掍晙 (��捸梲梜掍梮掍晙 梮掍��桵)';
+$labels['aclp'] = '����捸梣捸��捸朘掍晙';
+$labels['shortaclp'] = '����捸梣捸��捸朘掍晙';
+$labels['aclc'] = '��梲掍梐晢掍晙 掍梮晥捸梣捸梮捸朘梮掍��';
+$labels['aclk'] = '��梲掍梐晢掍晙 掍梮晥捸梣捸梮捸朘梮掍��';
+$labels['acld'] = '��梮梬掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
+$labels['aclt'] = '��梮梬掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
+$labels['acle'] = '��掍梩捸��梮掍晙';
+$labels['shortacle'] = '��掍梩捸��梮掍晙';
+$labels['aclx'] = '��梮梬掍晙 梣捸梮捸朘旍';
+$labels['acla'] = '埥捸梩捸桴捸��掍晙';
+$labels['shortacla'] = '埥捸梩捸桴捸��掍晙';
+$labels['aclfull'] = '埮��晛桴 桴掍��捸桹桵朘楖��桭';
+$labels['aclother'] = '埜桮晙';
+$labels['shortaclother'] = '埜桮晙';
+$labels['aclread'] = '埥捸��掑捸晙';
+$labels['shortaclr'] = '埥捸��掑捸晙';
+$labels['shortaclread'] = '埥捸��掑捸晙';
+$labels['aclwrite'] = '堀��掍晙';
+$labels['shortaclw'] = '堀��掍晙';
+$labels['shortaclwrite'] = '堀��掍晙';
+$labels['acldelete'] = '��梮梬掍晙';
+$labels['shortacld'] = '��梮梬掍晙';
+$labels['shortaclt'] = '��梮梬掍晙';
+$labels['shortacldelete'] = '��梮梬掍晙';
+$labels['shortacls'] = '��捸桹掍晙';
+$labels['shortacli'] = '��掍��掑梮掍晙';
+$labels['shortaclc'] = '��梲掍梐晢掍晙';
+$labels['shortaclk'] = '��梲掍梐晢掍晙';
+$labels['shortaclx'] = '��捸梮捸朘晛 梬梮梬楖��桭';
+$labels['longacll'] = '��捸梮捸朘旍 掍����楖��桭 敓 ��楖����捸朘梮掍��楖��桭 �� 梮��捸梮 桹梮捸��捸桴楖�� 敓 掅捸晡捸梮楖��掑捸掁��桴掍晙';
+$labels['longaclr'] = '��捸梮捸朘旍 朘捸��楖梐 敓 掅捸��桴掍晙 旍梮晥掍����桭捸梮 桹捸桭捸��';
+$labels['longaclread'] = '��捸梮捸朘旍 朘捸��楖梐 敓 掅捸��桴掍晙 旍梮晥掍����桭捸梮 桹捸桭捸��';
+$labels['longacls'] = '��掍桵桴捸晢 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 梮梫楖��桭旍 朘捸��楖梐 敓 ��楖��楖晜桴掍晙';
+$labels['longaclw'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 梮梫楖��桭梮掍��旍 �� 桹晛桭梮捸掅捸梩掍��旍 朘捸��楖梐 掍梮 ��楖��楖晜桴掍晙, 掅捸��捸梩楖��晥桮捸桭掅 ��掍桵捸晢 �� ��梮梬桴捸晢 梮梫楖��桭梮掍��晛';
+$labels['longacli'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 朘捸��楖梐 掍梮 掁��桴掍晙 �� 梣捸梲梜掍梮桴掍晙 梣捸梮捸朘晛 桭掍梬';
+$labels['longaclp'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 朘捸��楖梐 掍梮 桹��捸梣捸��捸朘桴掍晙 捸桮桵 梣捸梮捸朘楖��桭';
+$labels['longaclc'] = '��捸梮捸朘梮掍��旍 朘捸��楖梐 掍梮 桵梲掍梐晢桴掍晙 (朘捸桭 桴掍��捸梮桴捸梮桴掍晙) 捸桮桵 梣捸梮捸朘楖��桭';
+$labels['longaclk'] = '��捸梮捸朘梮掍��旍 朘捸��楖梐 掍梮 桵梲掍梐晢桴掍晙 (朘捸桭 桴掍��捸梮桴捸梮桴掍晙) 捸桮桵 梣捸梮捸朘楖��桭';
+$labels['longacld'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 ��梮梬掍晙 梮梫楖��桭旍 朘捸��楖梐 敓 ��楖��楖晜桴掍晙';
+$labels['longaclt'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 ��梮梬掍晙 梮梫楖��桭旍 朘捸��楖梐 敓 ��楖��楖晜桴掍晙';
+$labels['longacle'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 朘捸��楖梐 掍梮 桹掍梩捸��桴掍晙';
+$labels['longaclx'] = '��捸梮捸朘旍 朘捸��楖梐 敓 梬梮梬桴掍晙 朘捸桭 桴掍��捸梮桴捸梮桴掍晙';
+$labels['longacla'] = '��捸梮捸朘晛 桭楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 朘捸��楖梐 掍梮 ��楖��楖晜桴掍晙';
+$labels['longaclfull'] = '埮��晛桴 桴掍��捸桹桵朘楖��桭 梮掍��捸梩桮捸晙 梣捸梮捸朘梮掍��晛 朘捸梩捸桴捸��楖��桭旍';
+$labels['longaclwrite'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 朘捸��楖梐 掍梮 梮梫桴掍晙, 桵梲掍梐晢桴掍晙 �� 梣捸梲梜掍梮桴掍晙 捸桮桵 梣捸梮捸朘楖��桭';
+$labels['longacldelete'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 朘捸��楖梐 掍梮 梬梮梬桴掍晙';
+$labels['deleting'] = '��梮梬桴楖��桭 掍梮 桭楖��梲��晛 晛��捸桴楖��梮��梮掍��旍���';
+$labels['saving'] = '��捸桹梣捸梮桴楖��桭 掍梮 桭楖��梲��晛 晛��捸桴楖��梮��梮掍��旍���';
+$labels['updatesuccess'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 掅捸��掍桹捸梬楖梐 ��楖��楖晜桴掍��晛梮��';
+$labels['deletesuccess'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 掅捸��掍桹捸梬楖梐 梬梮梬桴掍��晛梮��';
+$labels['createsuccess'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 掅捸��掍桹捸梬楖梐 捸桴掍晙捸��桴掍��桴晛梮��';
+$labels['updateerror'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 晥捸��桭捸��楖��桭旍 梇捸晜楖梐桴掍����';
+$labels['deleteerror'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 梬梮梬楖��桭旍 梇捸晜楖梐桴掍����';
+$labels['createerror'] = '��楖��梲��晛 晛��捸桴楖��梮��梮掍��旍 捸桴掍晙捸��楖��桭旍 梇捸晜楖梐桴掍����';
+$labels['deleteconfirm'] = '埭楖���� 桴桵梲捸��桹 敓��, 楖�� ��捸梮朘捸梮楖��桭 掍�� 梮梫桴捸晢 ��掁梲桴楖梐梮掍��晛梮 捰��朘掍晙 桭楖��梲��晛 晛��捸桴楖��梮��梮掍��晛����';
+$labels['norights'] = '��桯 桭晛 晛��捸桴楖��梮�� 桯晛�� 梮梫桴掍晙��';
+$labels['nouser'] = '��掁梲桴楖梐晛 捸梮楖��梮旍 桯晛�� 梮梫桴掍晙��';
+
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
new file mode 100644
index 000000000..68be68021
--- /dev/null
+++ b/plugins/acl/localization/ja_JP.inc
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Takahiro Kambe                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '��望��';
+$labels['myrights'] = '��Ｕ�胯�颯�寞貝';
+$labels['username'] = '��艾�潦�嗚��:';
+$labels['advanced'] = '閰喟敦��芥�Ｕ�潦��';
+$labels['newuser'] = '�����柴��餈賢��';
+$labels['anyone'] = '(隤啜�扼��)�����嫘�艾�柴�艾�潦�嗚��';
+$labels['anonymous'] = '��脯�嫘��(��踹��)';
+$labels['acll'] = '璊�蝝�';
+$labels['shortacll'] = '璊�蝝�';
+$labels['aclr'] = '��∼����颯�潦�詻��隤准��';
+$labels['aclw'] = '��詻��颲潦�踴����押�����';
+$labels['aclc'] = '��萸�������押�怒�����雿����';
+$labels['aclk'] = '��萸�������押�怒�����雿����';
+$labels['acld'] = '��∼����颯�潦�詻��������';
+$labels['aclt'] = '��∼����颯�潦�詻��������';
+$labels['aclx'] = '�����押�怒����潦��������';
+$labels['aclread'] = '隤准�輯噯���';
+$labels['shortaclr'] = '隤准�輯噯���';
+$labels['shortaclread'] = '隤准�輯噯���';
+$labels['aclwrite'] = '��詻��颲潦��';
+$labels['shortaclw'] = '��詻��颲潦��';
+$labels['shortaclwrite'] = '��詻��颲潦��';
+$labels['acldelete'] = '������';
+$labels['shortacld'] = '������';
+$labels['shortaclt'] = '������';
+$labels['shortacldelete'] = '������';
+$labels['shortacli'] = '��踹��';
+$labels['shortaclc'] = '雿����';
+$labels['shortaclk'] = '雿����';
+$labels['shortaclx'] = '�����押�怒����潦�桀�����';
+$labels['deleting'] = '��Ｕ�胯�颯�寞貝��������支葉...';
+$labels['saving'] = '��Ｕ�胯�颯�寞貝���靽�摮�銝�...';
+$labels['updatesuccess'] = '��Ｕ�胯�颯�寞貝���憭���氬����整�����';
+$labels['deletesuccess'] = '��Ｕ�胯�颯�寞貝��������扎����整�����';
+$labels['createsuccess'] = '��Ｕ�胯�颯�寞貝���餈賢�������整�����';
+$labels['updateerror'] = '��Ｕ�胯�颯�寞貝�����湔�啜�扼����整�����';
+$labels['deleteerror'] = '��Ｕ�胯�颯�寞貝��������扎�扼����整�����';
+$labels['createerror'] = '��Ｕ�胯�颯�寞貝���餈賢����扼����整�����';
+
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
new file mode 100644
index 000000000..54f7d4032
--- /dev/null
+++ b/plugins/acl/localization/ko_KR.inc
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '窸蛙��';
+$labels['myrights'] = '���篞� 窷����';
+$labels['username'] = '��科�拖��:';
+$labels['newuser'] = '�����賈收 黺�穈�';
+$labels['identifier'] = '���貐����';
+$labels['acls'] = '��趣�� ������諢� ���鴔�';
+$labels['aclp'] = '窶����';
+$labels['shortaclp'] = '窶����';
+$labels['aclc'] = '������ ��渠�� 諤���曰萼';
+$labels['aclk'] = '������ ��渠�� 諤���曰萼';
+$labels['acld'] = '諰����鴔� ��原��';
+$labels['aclt'] = '諰����鴔� ��原��';
+$labels['aclx'] = '��渠�� ��原��';
+$labels['acla'] = '窵�謔科��';
+$labels['shortacla'] = '窵�謔科��';
+$labels['shortaclx'] = '��渠�� ��原��';
+$labels['longacli'] = '��渠����� 諰����鴔�諝� 貐蛙�秒��穇圉�� �����桶�� ��� ������';
+$labels['longaclp'] = '��� ��渠��諢� 諰����鴔�諝� 窶������� ��� ������';
+$labels['longaclc'] = '��� ��渠����� 諻�諢� 諻���� ��渠��諝� ������(������ ��渠�� 貐�窶�)��� ��� ������';
+$labels['longaclk'] = '��� ��渠����� 諻�諢� 諻���� ��渠��諝� ������(������ ��渠�� 貐�窶�)��� ��� ������';
+$labels['longacld'] = '諰����鴔� ��原�� ������篞資�� 貐�窶趟�� ��� ������';
+$labels['longaclt'] = '諰����鴔� ��原�� ������篞資�� 貐�窶趟�� ��� ������';
+$labels['longaclx'] = '��渠��諝� ��原�����穇圉�� ��渠�� 貐�窶� ��� ��� ������';
+$labels['longacla'] = '��渠����� ���篞� 窷������� 貐�窶踫�� ��� ������';
+$labels['longaclfull'] = '��渠�� 窵�謔禺未 ��秒�刮�� 諈刺�� �����湊��';
+$labels['longaclwrite'] = '諰����鴔���� ���������穇圉��, ��渠��諢� 諰����鴔�諝� 貐蛙�秒��穇圉�� �����桶�� ��� ������';
+$labels['longacldelete'] = '諰����鴔�諝� ��原����� ��� ������';
+$labels['deleting'] = '���篞� 窷���� ��原�� 鴗�...';
+$labels['saving'] = '���篞� 窷���� ������ 鴗�...';
+$labels['updatesuccess'] = '���篞� 窷������� 貐�窶踫�������� ��梓陬 ���.';
+$labels['deletesuccess'] = '���篞� 窷������� ��原����������� ��梓陬 ���.';
+$labels['createsuccess'] = '���篞� 窷������� 黺�穈���������� ��梓陬 ���.';
+$labels['updateerror'] = '���篞� 窷������� 穈桿����� ��� ������.';
+$labels['deleteerror'] = '���篞� 窷������� ��原����� ��� ������.';
+$labels['createerror'] = '���篞� 窷������� 黺�穈���� ��� ������.';
+$labels['deleteconfirm'] = '��������� ��科�拖��(���)��� ���篞� 窷������� ��原�����窸���� ������ 窶���� ������ ��拘��篧�?';
+$labels['norights'] = '鴔������� 窷������� ������!';
+$labels['nouser'] = '鴔������� username��� ������!';
+
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
new file mode 100644
index 000000000..68dcc7f96
--- /dev/null
+++ b/plugins/acl/localization/nl_NL.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Delen';
+$labels['myrights'] = 'Toegangsrechten';
+$labels['username'] = 'Gebruiker:';
+$labels['advanced'] = 'geavanceerde modus';
+$labels['newuser'] = 'Item toevoegen';
+$labels['actions'] = 'Toegangsrechtenopties...';
+$labels['anyone'] = 'Alle gebruikers (iedereen)';
+$labels['anonymous'] = 'Gasten (anoniem)';
+$labels['identifier'] = 'Identificatie';
+$labels['acll'] = 'Opzoeken';
+$labels['shortacll'] = 'Opzoeken';
+$labels['aclr'] = 'Berichten lezen';
+$labels['acls'] = 'Onthoud gelezen-status';
+$labels['aclw'] = 'Markeringen instellen';
+$labels['acli'] = 'Invoergen (kopi禱ren naar)';
+$labels['aclp'] = 'Plaatsen';
+$labels['shortaclp'] = 'Plaatsen';
+$labels['aclc'] = 'Submappen aanmaken';
+$labels['aclk'] = 'Submappen aanmaken';
+$labels['acld'] = 'Berichten verwijderen';
+$labels['aclt'] = 'Berichten verwijderen';
+$labels['acle'] = 'Vernietigen';
+$labels['shortacle'] = 'Vernietigen';
+$labels['aclx'] = 'Map verwijderen';
+$labels['acla'] = 'Beheren';
+$labels['shortacla'] = 'Beheren';
+$labels['aclfull'] = 'Volledige toegang';
+$labels['aclother'] = 'Overig';
+$labels['shortaclother'] = 'Overig';
+$labels['aclread'] = 'Lezen';
+$labels['shortaclr'] = 'Lezen';
+$labels['shortaclread'] = 'Lezen';
+$labels['aclwrite'] = 'Schrijven';
+$labels['shortaclw'] = 'Schrijven';
+$labels['shortaclwrite'] = 'Schrijven';
+$labels['acldelete'] = 'Verwijderen';
+$labels['shortacld'] = 'Verwijderen';
+$labels['shortaclt'] = 'Verwijderen';
+$labels['shortacldelete'] = 'Verwijderen';
+$labels['shortacls'] = 'Behouden';
+$labels['shortacli'] = 'Invoegen';
+$labels['shortaclc'] = 'Aanmaken';
+$labels['shortaclk'] = 'Aanmaken';
+$labels['shortaclx'] = 'Map verwijderen';
+$labels['longacll'] = 'De map is zichtbaar in lijsten en het is mogelijk om te abonneren op deze map';
+$labels['longaclr'] = 'De map kan geopend worden om te lezen';
+$labels['longaclread'] = 'De map kan geopend worden om te lezen';
+$labels['longacls'] = 'De berichtmarkering \'Gelezen\' kan aangepast worden';
+$labels['longaclw'] = 'Berichtmarkeringen en labels kunnen aangepast worden, behalve \'Gelezen\' en \'Verwijderd\'';
+$labels['longacli'] = 'Berichten kunnen opgesteld worden of gekopieerd worden naar deze map';
+$labels['longaclp'] = 'Berichten kunnen geplaatst worden in deze map';
+$labels['longaclc'] = 'Mappen kunnen aangemaakt of hernoemd worden rechtstreeks onder deze map';
+$labels['longaclk'] = 'Mappen kunnen aangemaakt of hernoemd worden rechtstreeks onder deze map';
+$labels['longacld'] = 'De berichtmarkering \'Verwijderd\' kan aangepast worden';
+$labels['longaclt'] = 'De berichtmarkering \'Verwijderd\' kan aangepast worden';
+$labels['longacle'] = 'Berichten kunnen vernietigd worden';
+$labels['longaclx'] = 'De map kan verwijderd of hernoemd worden';
+$labels['longacla'] = 'De toegangsrechten voor deze map kunnen veranderd worden';
+$labels['longaclfull'] = 'Volledige controle inclusief mappenbeheer';
+$labels['longaclwrite'] = 'Berichten kunnen gemarkeerd worden, opgesteld worden of gekopieerd worden naar deze map';
+$labels['longacldelete'] = 'Berichten kunnen verwijderd worden';
+$labels['deleting'] = 'Toegangsrechten worden verwijderd...';
+$labels['saving'] = 'Toegangsrechten worden opgeslagen...';
+$labels['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
+$labels['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
+$labels['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
+$labels['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
+$labels['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
+$labels['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
+$labels['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
+$labels['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
+$labels['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
+
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index 0b3689927..b8007f025 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
 $labels['sharing'] = 'Udost��pnianie';
 $labels['myrights'] = 'Prawa dost��pu';
 $labels['username'] = 'U髒ytkownik:';
@@ -9,50 +23,46 @@ $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Go��cie (anonymous)';
 $labels['identifier'] = 'Identyfikator';
-
-$labels['acll'] = 'Podgl��d (Lookup)';
+$labels['acll'] = 'Podgl��d';
+$labels['shortacll'] = 'Podgl��d';
 $labels['aclr'] = 'Odczyt (Read)';
 $labels['acls'] = 'Zmiana stanu wiadomo��ci (Keep)';
 $labels['aclw'] = 'Zmiana flag wiadomo��ci (Write)';
 $labels['acli'] = 'Dodawanie/Kopiowanie do (Insert)';
-$labels['aclp'] = 'Wysy��anie (Post)';
+$labels['aclp'] = 'Wysy��anie';
+$labels['shortaclp'] = 'Wysy��anie';
 $labels['aclc'] = 'Tworzenie podfolder籀w (Create)';
 $labels['aclk'] = 'Tworzenie podfolder籀w (Create)';
 $labels['acld'] = 'Usuwanie wiadomo��ci (Delete)';
 $labels['aclt'] = 'Usuwanie wiadomo��ci (Delete)';
-$labels['acle'] = 'Porz��dkowanie folderu (Expunge)';
+$labels['acle'] = 'Porz��dkowanie';
+$labels['shortacle'] = 'Porz��dkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
-$labels['acla'] = 'Administracja (Administer)';
-
+$labels['acla'] = 'Administracja';
+$labels['shortacla'] = 'Administracja';
 $labels['aclfull'] = 'Wszystkie';
-$labels['aclother'] = 'Inne';
+$labels['aclother'] = 'Pozosta��e';
+$labels['shortaclother'] = 'Pozosta��e';
 $labels['aclread'] = 'Odczyt';
+$labels['shortaclr'] = 'Odczyt';
+$labels['shortaclread'] = 'Odczyt';
 $labels['aclwrite'] = 'Zapis';
+$labels['shortaclw'] = 'Zapis';
+$labels['shortaclwrite'] = 'Zapis';
 $labels['acldelete'] = 'Usuwanie';
-
-$labels['shortacll'] = 'Podgl��d';
-$labels['shortaclr'] = 'Odczyt';
+$labels['shortacld'] = 'Usuwanie';
+$labels['shortaclt'] = 'Usuwanie';
+$labels['shortacldelete'] = 'Usuwanie';
 $labels['shortacls'] = 'Zmiana';
-$labels['shortaclw'] = 'Zmiana flag';
 $labels['shortacli'] = 'Dodawanie';
-$labels['shortaclp'] = 'Wysy��anie';
 $labels['shortaclc'] = 'Tworzenie';
 $labels['shortaclk'] = 'Tworzenie';
-$labels['shortacld'] = 'Usuwanie';
-$labels['shortaclt'] = 'Usuwanie';
-$labels['shortacle'] = 'Porz��dkowanie';
 $labels['shortaclx'] = 'Usuwanie folderu';
-$labels['shortacla'] = 'Administracja';
-
-$labels['shortaclother'] = 'Pozosta��e';
-$labels['shortaclread'] = 'Odczyt';
-$labels['shortaclwrite'] = 'Zapis';
-$labels['shortacldelete'] = 'Usuwanie';
-
 $labels['longacll'] = 'Pozwala na subskrybowanie folderu i powoduje, 髒e jest on widoczny na li��cie';
-$labels['longaclr'] = 'Pozwala na otwarcie folderu w trybie do odczytu';
+$labels['longaclr'] = 'Folder mo髒e by�� otwarty w trybie do odczytu';
+$labels['longaclread'] = 'Folder mo髒e by�� otwarty w trybie do odczytu';
 $labels['longacls'] = 'Pozwala na zmien�� stanu wiadomo��ci';
-$labels['longaclw'] = 'Pozwala zmienia�� wszystkie flagi wiadomo��ci, opr籀cz "Przeczytano" i "Usuni��to"';
+$labels['longaclw'] = 'Pozwala zmienia�� wszystkie flagi wiadomo��ci, opr籀cz "Przeczytano" i "Usuni��to';
 $labels['longacli'] = 'Pozwala zapisywa�� wiadomo��ci i kopiowa�� do folderu';
 $labels['longaclp'] = 'Pozwala wysy��a�� wiadomo��ci do folderu';
 $labels['longaclc'] = 'Pozwala tworzy�� (lub zmienia�� nazw��) podfoldery';
@@ -62,22 +72,18 @@ $labels['longaclt'] = 'Pozwala zmiania�� flag�� "Usuni��to" wiadomo��ci';
 $labels['longacle'] = 'Pozwala na usuwanie wiadomo��ci oznaczonych do usuni��cia';
 $labels['longaclx'] = 'Pozwala na zmian�� nazwy lub usuni��cie folderu';
 $labels['longacla'] = 'Pozwala na zmiane praw dost��pu do folderu';
-
 $labels['longaclfull'] = 'Pe��na kontrola w����cznie z administrowaniem folderem';
-$labels['longaclread'] = 'Folder mo髒e by�� otwarty w trybie do odczytu';
 $labels['longaclwrite'] = 'Wiadomo��ci mog�� by�� oznaczane, zapisywane i kopiowane do folderu';
 $labels['longacldelete'] = 'Wiadomo��ci mog�� by�� usuwane';
+$labels['deleting'] = 'Usuwanie praw dost��pu...';
+$labels['saving'] = 'Zapisywanie praw dost��pu...';
+$labels['updatesuccess'] = 'Pomy��lnie zmieniono prawa dost��pu';
+$labels['deletesuccess'] = 'Pomy��lnie usuni��to prawa dost��pu';
+$labels['createsuccess'] = 'Pomy��lnie dodano prawa dost��pu';
+$labels['updateerror'] = 'Nie uda��o si�� zmieni�� praw dost��pu';
+$labels['deleteerror'] = 'Nie uda��o si�� usun���� praw dost��pu';
+$labels['createerror'] = 'Nie uda��o si�� doda�� praw dost��pu';
+$labels['deleteconfirm'] = 'Czy na pewno chcesz usun���� prawa wybranym u髒ytkownikom?';
+$labels['norights'] = 'Nie wybrano praw dost��pu!';
+$labels['nouser'] = 'Nie podano nazwy u髒ytkownika!';
 
-$messages['deleting'] = 'Usuwanie praw dost��pu...';
-$messages['saving'] = 'Zapisywanie praw dost��pu...';
-$messages['updatesuccess'] = 'Pomy��lnie zmieniono prawa dost��pu';
-$messages['deletesuccess'] = 'Pomy��lnie usuni��to prawa dost��pu';
-$messages['createsuccess'] = 'Pomy��lnie dodano prawa dost��pu';
-$messages['updateerror'] = 'Nie uda��o si�� zmieni�� praw dost��pu';
-$messages['deleteerror'] = 'Nie uda��o si�� usun���� praw dost��pu';
-$messages['createerror'] = 'Nie uda��o si�� doda�� praw dost��pu';
-$messages['deleteconfirm'] = 'Czy na pewno chcesz usun���� prawa wybranym u髒ytkownikom?';
-$messages['norights'] = 'Nie wybrano praw dost��pu!';
-$messages['nouser'] = 'Nie podano nazwy u髒ytkownika!';
-
-?>
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
new file mode 100644
index 000000000..2e4828304
--- /dev/null
+++ b/plugins/acl/localization/pt_BR.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Claudio F Filho <filhocf@gmail.com>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Compartilhamento';
+$labels['myrights'] = 'Permiss繭es de Acesso';
+$labels['username'] = 'Usu獺rio:';
+$labels['advanced'] = 'modo avan癟ado';
+$labels['newuser'] = 'Adicionar entrada';
+$labels['actions'] = 'A癟繭es de direito de acesso...';
+$labels['anyone'] = 'Todos os usu獺rios (qualquer um)';
+$labels['anonymous'] = 'Convidados (an繫nimos)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Pesquisar';
+$labels['shortacll'] = 'Pesquisar';
+$labels['aclr'] = 'Ler mensagens';
+$labels['acls'] = 'Manter estado de enviado';
+$labels['aclw'] = 'Salvar marcadores';
+$labels['acli'] = 'Inserir (C籀pia em)';
+$labels['aclp'] = 'Enviar';
+$labels['shortaclp'] = 'Enviar';
+$labels['aclc'] = 'Criar subpastas';
+$labels['aclk'] = 'Criar subpastas';
+$labels['acld'] = 'Apagar mensagens';
+$labels['aclt'] = 'Apagar mensagens';
+$labels['acle'] = 'Expurgar';
+$labels['shortacle'] = 'Expurgar';
+$labels['aclx'] = 'Apagar pasta';
+$labels['acla'] = 'Administrar';
+$labels['shortacla'] = 'Administrar';
+$labels['aclfull'] = 'Controle total';
+$labels['aclother'] = 'Outro';
+$labels['shortaclother'] = 'Outro';
+$labels['aclread'] = 'Ler';
+$labels['shortaclr'] = 'Ler';
+$labels['shortaclread'] = 'Ler';
+$labels['aclwrite'] = 'Salvar';
+$labels['shortaclw'] = 'Salvar';
+$labels['shortaclwrite'] = 'Salvar';
+$labels['acldelete'] = 'Excluir';
+$labels['shortacld'] = 'Excluir';
+$labels['shortaclt'] = 'Excluir';
+$labels['shortacldelete'] = 'Excluir';
+$labels['shortacls'] = 'Manter';
+$labels['shortacli'] = 'Inserir';
+$labels['shortaclc'] = 'Criar';
+$labels['shortaclk'] = 'Criar';
+$labels['shortaclx'] = 'Excluir pasta';
+$labels['longacll'] = 'A pasta est獺 vis穩vel nas listas e pode ser inscrita para';
+$labels['longaclr'] = 'A pasta pode ser aberta para leitura';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
+$labels['longacls'] = 'Marcador de Mensagem Enviada pode ser modificadas';
+$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser modificadas, exceto de Enviadas e Exclu穩das';
+$labels['longacli'] = 'As mensagens podem ser escritas ou copiadas para a pasta';
+$labels['longaclp'] = 'As mensagens podem ser enviadas para esta pasta';
+$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) diretamente sob esta pasta';
+$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) diretamente sob esta pasta';
+$labels['longacld'] = 'O marcador de Mensagens Exclu穩das podem ser modificadas';
+$labels['longaclt'] = 'O marcador de Mensagens Exclu穩das podem ser modificadas';
+$labels['longacle'] = 'As mensagens podem ser expurgadas';
+$labels['longaclx'] = 'A pasta pode ser apagada ou renomeada';
+$labels['longacla'] = 'As permiss繭es de acesso da pasta podem ser alteradas';
+$labels['longaclfull'] = 'Controle total incluindo a pasta de administra癟瓊o';
+$labels['longaclwrite'] = 'As mensagens podem ser marcadas, salvas ou copiadas para a pasta';
+$labels['longacldelete'] = 'Mensagens podem ser apagadas';
+$labels['deleting'] = 'Apagando permiss繭es de acesso...';
+$labels['saving'] = 'Salvando permiss繭es de acesso...';
+$labels['updatesuccess'] = 'Permiss繭es de acesso alteradas com sucesso';
+$labels['deletesuccess'] = 'Permiss繭es de acesso apagadas com sucesso';
+$labels['createsuccess'] = 'Permiss繭es de acesso adicionadas com sucesso';
+$labels['updateerror'] = 'N瓊o foi poss穩vel atualizar as permiss繭es de acesso';
+$labels['deleteerror'] = 'N瓊o foi poss穩vel apagar as permiss繭es de acesso';
+$labels['createerror'] = 'N瓊o foi poss穩vel adicionar as permiss繭es de acesso';
+$labels['deleteconfirm'] = 'Tem certeza que deseja remover as permiss繭es de acesso do(s) usu獺rio(s) delecionado(s)?';
+$labels['norights'] = 'N瓊o foram definidas permiss繭es!';
+$labels['nouser'] = 'Nome de usu獺rio n瓊o especificado!';
+
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
new file mode 100644
index 000000000..72c595afa
--- /dev/null
+++ b/plugins/acl/localization/pt_PT.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Partilhar';
+$labels['myrights'] = 'Permiss繭es de acesso';
+$labels['username'] = 'Utilizador:';
+$labels['advanced'] = 'Modo avan癟ado';
+$labels['newuser'] = 'Adicionar entrada';
+$labels['actions'] = 'Ac癟繭es de permiss瓊o de acesso...';
+$labels['anyone'] = 'Todos os utilizadores (todos)';
+$labels['anonymous'] = 'Convidado (an籀nimo)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Pesquisar';
+$labels['shortacll'] = 'Pesquisar';
+$labels['aclr'] = 'Ler mensagens';
+$labels['acls'] = 'Manter estado de enviado';
+$labels['aclw'] = 'Guardar marcadores';
+$labels['acli'] = 'Inserir (c籀pia em)';
+$labels['aclp'] = 'Publicar';
+$labels['shortaclp'] = 'Publicar';
+$labels['aclc'] = 'Criar subpastas';
+$labels['aclk'] = 'Criar subpastas';
+$labels['acld'] = 'Eliminar mensagens';
+$labels['aclt'] = 'Eliminar mensagens';
+$labels['acle'] = 'Eliminar';
+$labels['shortacle'] = 'Eliminar';
+$labels['aclx'] = 'Eliminar pasta';
+$labels['acla'] = 'Administrar';
+$labels['shortacla'] = 'Administrar';
+$labels['aclfull'] = 'Controlo total';
+$labels['aclother'] = 'Outro';
+$labels['shortaclother'] = 'Outro';
+$labels['aclread'] = 'Ler';
+$labels['shortaclr'] = 'Ler';
+$labels['shortaclread'] = 'Ler';
+$labels['aclwrite'] = 'Guardar';
+$labels['shortaclw'] = 'Guardar';
+$labels['shortaclwrite'] = 'Guardar';
+$labels['acldelete'] = 'Eliminar';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
+$labels['shortacldelete'] = 'Eliminar';
+$labels['shortacls'] = 'Manter';
+$labels['shortacli'] = 'Inserir';
+$labels['shortaclc'] = 'Criar';
+$labels['shortaclk'] = 'Criar';
+$labels['shortaclx'] = 'Eliminar pasta';
+$labels['longacll'] = 'A pasta est獺 vis穩vel na lista e pode subscrita para';
+$labels['longaclr'] = 'A pasta pode ser aberta para leitura';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
+$labels['longacls'] = 'O marcador de mensagem enviada pode ser alterado';
+$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto de Enviadas e Eliminadas';
+$labels['longacli'] = 'As mensagens podem ser escritas e copiadas para a pasta';
+$labels['longaclp'] = 'As mensagens podem ser publicadas na pasta';
+$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
+$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
+$labels['longacld'] = 'O marcador de mensagens Eliminadas pode ser alterado';
+$labels['longaclt'] = 'O marcador de mensagens Eliminadas pode ser alterado';
+$labels['longacle'] = 'As mensagens podem ser eliminadas';
+$labels['longaclx'] = 'A pasta pode ser eliminada ou renomeada';
+$labels['longacla'] = 'As permiss繭es de acesso da pasta podem ser alteradas';
+$labels['longaclfull'] = 'Controlo total incluindo administra癟瓊o da pasta';
+$labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
+$labels['longacldelete'] = 'As mensagens podem ser eliminadas';
+$labels['deleting'] = 'A eliminar as permiss繭es de acesso...';
+$labels['saving'] = 'A guardar as permiss繭es de acesso...';
+$labels['updatesuccess'] = 'Permiss繭es de acesso alteradas com sucesso';
+$labels['deletesuccess'] = 'Permiss繭es de acesso eliminadas com sucesso';
+$labels['createsuccess'] = 'Permiss繭es de acesso adicionadas com sucesso';
+$labels['updateerror'] = 'N瓊o foi poss穩vel actualizar as permiss繭es de acesso';
+$labels['deleteerror'] = 'N瓊o foi poss穩vel eliminar as permiss繭es de acesso';
+$labels['createerror'] = 'N瓊o foi poss穩vel adicionar as permiss繭es de acesso';
+$labels['deleteconfirm'] = 'Tem a certeza que pretende remover as permiss繭es de acesso do(s) utilizador(es) seleccionado(s)?';
+$labels['norights'] = 'N瓊o foram especificadas quaisquer permiss繭es!';
+$labels['nouser'] = 'N瓊o foi especificado nenhum nome de utilizador!';
+
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
new file mode 100644
index 000000000..f50610a03
--- /dev/null
+++ b/plugins/acl/localization/ru_RU.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '苤郋赲邾迮����郇��邿 迡郋������郈';
+$labels['myrights'] = '����訄赲訄 迡郋������郈訄';
+$labels['username'] = '��郋郅��郱郋赲訄��迮郅��:';
+$labels['advanced'] = '衪郕��郈迮����郇��邿 ��迮迠邽邾';
+$labels['newuser'] = '��郋訇訄赲邽���� 郈郋郅迮';
+$labels['actions'] = '��迮邿����赲邽�� �� 郈��訄赲訄邾邽 迡郋������郈訄...';
+$labels['anyone'] = '����迮 郈郋郅��郱郋赲訄��迮郅邽 (郅��訇��迮)';
+$labels['anonymous'] = '��郋����邽 (訄郇郋郇邽邾郇��迮)';
+$labels['identifier'] = '��迡迮郇��邽��邽郕訄��郋��';
+$labels['acll'] = '��郋邽��郕';
+$labels['shortacll'] = '��郋邽��郕';
+$labels['aclr'] = '����郋��邽��訄���� ��郋郋訇��迮郇邽��';
+$labels['acls'] = '������訄赲邽���� ��郋����郋��郇邽迮 苺赲邽迡迮郇郋';
+$labels['aclw'] = '苳郅訄迣邽 郱訄郈邽��邽';
+$labels['acli'] = '������訄赲邽���� (郕郋郈邽��郋赲訄���� 赲...)';
+$labels['aclp'] = '����郈��訄赲邽����';
+$labels['shortaclp'] = '����郈��訄赲邽����';
+$labels['aclc'] = '苤郋郱迡訄���� 赲郅郋迠迮郇郇��迮 郈訄郈郕邽';
+$labels['aclk'] = '苤郋郱迡訄���� 赲郅郋迠迮郇郇��迮 郈訄郈郕邽';
+$labels['acld'] = '苺迡訄郅邽���� ��郋郋訇��迮郇邽��';
+$labels['aclt'] = '苺迡訄郅邽���� ��郋郋訇��迮郇邽��';
+$labels['acle'] = '苺郇邽����郋迠邽���� ��郋郋訇��迮郇邽��';
+$labels['shortacle'] = '苺郇邽����郋迠邽���� ��郋郋訇��迮郇邽��';
+$labels['aclx'] = '苺迡訄郅邽���� 郈訄郈郕��';
+$labels['acla'] = '��迡邾邽郇邽������邽��郋赲訄����';
+$labels['shortacla'] = '��迡邾邽郇邽������邽��郋赲訄����';
+$labels['aclfull'] = '��郋郅郇��邿 迡郋������郈';
+$labels['aclother'] = '������迣郋迮';
+$labels['shortaclother'] = '������迣郋迮';
+$labels['aclread'] = '虴��迮郇邽迮';
+$labels['shortaclr'] = '虴��迮郇邽迮';
+$labels['shortaclread'] = '虴��迮郇邽迮';
+$labels['aclwrite'] = '��訄郈邽����';
+$labels['shortaclw'] = '��訄郈邽����';
+$labels['shortaclwrite'] = '��訄郈邽����';
+$labels['acldelete'] = '苺迡訄郅迮郇邽迮';
+$labels['shortacld'] = '苺迡訄郅迮郇邽迮';
+$labels['shortaclt'] = '苺迡訄郅迮郇邽迮';
+$labels['shortacldelete'] = '苺迡訄郅迮郇邽迮';
+$labels['shortacls'] = '������訄赲邽����';
+$labels['shortacli'] = '������訄赲邽����';
+$labels['shortaclc'] = '苤郋郱迡訄����';
+$labels['shortaclk'] = '苤郋郱迡訄����';
+$labels['shortaclx'] = '苺迡訄郅迮郇邽迮 郈訄郈郕邽';
+$labels['longacll'] = '��訄郈郕訄 赲邽迡邽邾訄 赲 ��郈邽��郕訄�� 邽 迡郋������郈郇訄 迡郅�� 郈郋迡郈邽��郕邽';
+$labels['longaclr'] = '衪��訄 郈訄郈郕訄 邾郋迠迮�� 訇������ 郋��郕������訄 迡郅�� ����迮郇邽��';
+$labels['longaclread'] = '衪��訄 郈訄郈郕訄 邾郋迠迮�� 訇������ 郋��郕������訄 迡郅�� ����迮郇邽��';
+$labels['longacls'] = '苳郅訄迣 ����郋��邽��訄郇郋 邾郋迠迮�� 訇������ 邽郱邾迮郇迮郇';
+$labels['longaclw'] = '苳郅訄迣邽 邽 郕郅����迮赲��迮 ��郅郋赲訄, 郕��郋邾迮 ����郋��邽��訄郇郋 邽 苺迡訄郅迮郇郋, 邾郋迣���� 訇������ 邽郱邾迮郇迮郇��';
+$labels['longacli'] = '苤郋郋訇��迮郇邽�� 邾郋迣���� 訇������ 郱訄郈邽��訄郇�� 邽郅邽 ��郕郋郈邽��郋赲訄郇�� 赲 郈訄郈郕��';
+$labels['longaclp'] = '苤郋郋訇��迮郇邽�� 邾郋迣���� 訇������ 郋��郈��訄赲郅迮郇�� 赲 ������ 郈訄郈郕��';
+$labels['longaclc'] = '��郋迡郈訄郈郕邽 邾郋迣���� 訇������ ��郋郱迡訄郇�� 邽郅邽 郈迮��迮邽邾迮郇郋赲訄郇�� 郈����邾郋 赲 ����郋邿 郈訄郈郕迮';
+$labels['longaclk'] = '��郋迡郈訄郈郕邽 邾郋迣���� 訇������ ��郋郱迡訄郇�� 邽郅邽 郈迮��迮邽邾迮郇郋赲訄郇�� 郈����邾郋 赲 ����郋邿 郈訄郈郕迮';
+$labels['longacld'] = '苳郅訄迣 苺迡訄郅迮郇郋 邾郋迠迮�� 訇������ 邽郱邾迮郇迮郇';
+$labels['longaclt'] = '苳郅訄迣 苺迡訄郅迮郇郋 邾郋迠迮�� 訇������ 邽郱邾迮郇迮郇';
+$labels['longacle'] = '苤郋郋訇��迮郇邽�� 邾郋迣���� 訇������ ��郇邽����郋迠迮郇��';
+$labels['longaclx'] = '衪��訄 郈訄郈郕訄 邾郋迠迮�� 訇������ 郈迮��迮邽邾迮郇郋赲訄郇訄 邽郅邽 ��迡訄郅迮郇訄';
+$labels['longacla'] = '����訄赲訄 迡郋������郈訄 郕 郈訄郈郕迮 邾郋迣���� 訇������ 邽郱邾迮郇迮郇��';
+$labels['longaclfull'] = '��郋郅郇��邿 迡郋������郈, 赲郕郅����訄�� ��郈��訄赲郅迮郇邽迮 郈訄郈郕郋邿';
+$labels['longaclwrite'] = '苤郋郋訇��迮郇邽�� 邾郋迠郇郋 郈郋邾迮��訄����, 郱訄郈邽����赲訄���� 邽郅邽 郕郋郈邽��郋赲訄���� 赲 郈訄郈郕��';
+$labels['longacldelete'] = '苤郋郋訇��迮郇邽�� 邾郋迠郇郋 ��迡訄郅������';
+$labels['deleting'] = '苺迡訄郅迮郇邽迮 郈��訄赲 迡郋������郈訄...';
+$labels['saving'] = '苤郋����訄郇迮郇邽迮 郈��訄赲 迡郋������郈訄...';
+$labels['updatesuccess'] = '����訄赲訄 迡郋������郈訄 ����郈迮��郇郋 邽郱邾迮郇迮郇��';
+$labels['deletesuccess'] = '����訄赲訄 迡郋������郈訄 ����郈迮��郇郋 ��迡訄郅迮郇��';
+$labels['createsuccess'] = '苺��郈迮��郇郋 迡郋訇訄赲郅迮郇�� 郈��訄赲訄 迡郋������郈訄';
+$labels['updateerror'] = '��迮赲郋郱邾郋迠郇郋 郋訇郇郋赲邽���� 郈��訄赲訄 迡郋������郈訄';
+$labels['deleteerror'] = '��迮赲郋郱邾郋迠郇郋 ��迡訄郅邽���� 郈��訄赲訄 迡郋������郈訄';
+$labels['createerror'] = '��迮赲郋郱邾郋迠郇郋 迡郋訇訄赲邽���� 郈��訄赲訄 迡郋������郈訄';
+$labels['deleteconfirm'] = '���� ��赲迮��迮郇�� 赲 ��郋邾, ����郋 ��郋��邽��迮 ��迡訄郅邽���� 郈��訄赲訄 迡郋������郈訄 赲��訇��訄郇郇���� 郈郋郅��郱郋赲訄��迮郅迮邿?';
+$labels['norights'] = '����訄赲訄 迡郋������郈訄 郇迮 ������訄郇郋赲郅迮郇��!';
+$labels['nouser'] = '��迮 郋郈��迮迡迮郅迮郇郋 邽邾�� 郈郋郅��郱郋赲訄��迮郅��!';
+
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
new file mode 100644
index 000000000..d83a87a3e
--- /dev/null
+++ b/plugins/acl/localization/sk_SK.inc
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: panda                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Zdie躂anie';
+$labels['myrights'] = 'Pr穩stupov矇 pr獺va';
+$labels['username'] = 'U鱉穩vate躂:';
+$labels['advanced'] = 'pokro��il羸 m籀d';
+$labels['newuser'] = 'Prida聽 繳daj';
+$labels['anyone'] = 'V禳etci u鱉穩vatelia (ktoko躂vek)';
+$labels['anonymous'] = 'Hostia (anonymne)';
+$labels['identifier'] = 'Identifik獺tor';
+$labels['acll'] = 'H躂adanie';
+$labels['shortacll'] = 'H躂adanie';
+$labels['aclr'] = '��穩ta聽 spr獺vy';
+$labels['acli'] = 'Vlo鱉i聽 (kop穩rova聽 do)';
+$labels['aclc'] = 'Vytvori聽 podprie��inky';
+$labels['aclk'] = 'Vytvori聽 podprie��inky';
+$labels['acld'] = 'Zmaza聽 spr獺vy';
+$labels['aclt'] = 'Zmaza聽 spr獺vy';
+$labels['aclx'] = 'Zmaza聽 prie��inok';
+$labels['acla'] = 'Spravova聽';
+$labels['shortacla'] = 'Spravova聽';
+$labels['acldelete'] = 'Zmaza聽';
+$labels['shortacld'] = 'Zmaza聽';
+$labels['shortaclt'] = 'Zmaza聽';
+$labels['shortacldelete'] = 'Zmaza聽';
+$labels['shortacls'] = 'Ponecha聽';
+$labels['shortacli'] = 'Vlo鱉i聽';
+$labels['shortaclc'] = 'Vytvori聽';
+$labels['shortaclk'] = 'Vytvori聽';
+
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
new file mode 100644
index 000000000..e644c9d14
--- /dev/null
+++ b/plugins/acl/localization/sl_SI.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Skupna raba';
+$labels['myrights'] = 'Pravice dostopa';
+$labels['username'] = 'Uporabnik:';
+$labels['advanced'] = 'Napredni na��in';
+$labels['newuser'] = 'Dodaj vnos';
+$labels['actions'] = 'Nastavitve pravic dostopa';
+$labels['anyone'] = 'Vsi uporabniki';
+$labels['anonymous'] = 'Gosti';
+$labels['identifier'] = 'Ozna��evalnik';
+$labels['acll'] = 'Iskanje';
+$labels['shortacll'] = 'Iskanje';
+$labels['aclr'] = 'Prebrana sporo��ila';
+$labels['acls'] = 'Ohrani status \'Prebrano\'';
+$labels['aclw'] = 'Ozna��i pisanje sporo��ila';
+$labels['acli'] = 'Vstavi (Kopiraj v)';
+$labels['aclp'] = 'Objava';
+$labels['shortaclp'] = 'Objava';
+$labels['aclc'] = 'Ustvari podmape';
+$labels['aclk'] = 'Ustvari podmape';
+$labels['acld'] = 'Izbri禳i sporo��ila';
+$labels['aclt'] = 'Izbri禳i sporo��ila';
+$labels['acle'] = 'Izbri禳i';
+$labels['shortacle'] = 'Izbri禳i';
+$labels['aclx'] = 'Izbri禳i mapo';
+$labels['acla'] = 'Uredi';
+$labels['shortacla'] = 'Uredi';
+$labels['aclfull'] = 'Popolno upravljanje';
+$labels['aclother'] = 'Ostalo';
+$labels['shortaclother'] = 'Ostalo';
+$labels['aclread'] = 'Preberi';
+$labels['shortaclr'] = 'Preberi';
+$labels['shortaclread'] = 'Preberi';
+$labels['aclwrite'] = 'Sestavi';
+$labels['shortaclw'] = 'Sestavi';
+$labels['shortaclwrite'] = 'Sestavi';
+$labels['acldelete'] = 'Izbri禳i';
+$labels['shortacld'] = 'Izbri禳i';
+$labels['shortaclt'] = 'Izbri禳i';
+$labels['shortacldelete'] = 'Izbri禳i';
+$labels['shortacls'] = 'Ohrani';
+$labels['shortacli'] = 'Vstavi';
+$labels['shortaclc'] = 'Ustvari';
+$labels['shortaclk'] = 'Ustvari';
+$labels['shortaclx'] = 'Izbri禳i mapo';
+$labels['longacll'] = 'Mapa je vidna na seznamih in jo lahko naro��ite';
+$labels['longaclr'] = 'Mapa je na voljo za branje';
+$labels['longaclread'] = 'Mapa je na voljo za branje';
+$labels['longacls'] = 'Oznaka \'Prebrano sporo��ilo\' je lahko spremenjena';
+$labels['longaclw'] = 'Oznake sporo��il in klju��ne besede je mogo��e spremeniti, z izjemo oznak "Prebrano" in "Izbrisano';
+$labels['longacli'] = 'Sporo��ilo je lahko poslano ali kopirano v mapo';
+$labels['longaclp'] = 'Sporo��ilo je lahko poslano v to mapo';
+$labels['longaclc'] = 'V tej mapi so lahko ustvarjene (ali preimenovane) podmape';
+$labels['longaclk'] = 'V tej mapi so lahko ustvarjene (ali preimenovane) podmape';
+$labels['longacld'] = 'Oznako sporo��ila  \'Izbrisano\' je mogo��e spremeniti';
+$labels['longaclt'] = 'Oznako sporo��ila  \'Izbrisano\' je mogo��e spremeniti';
+$labels['longacle'] = 'Sporo��ila so lahko izbrisana';
+$labels['longaclx'] = 'Mapa je lahko izbrisana ali preimenovana';
+$labels['longacla'] = 'Pravice na mapi so lahko spremenjene';
+$labels['longaclfull'] = 'Popolno upravljanje, vklju��no z urejanjem map';
+$labels['longaclwrite'] = 'Sporo��ila je mogo��e ozna��iti, sestaviti ali kopirati v mapo';
+$labels['longacldelete'] = 'Sporo��ila so lahko izbrisana';
+$labels['deleting'] = 'Brisanje pravic';
+$labels['saving'] = 'Shranjevanje pravic';
+$labels['updatesuccess'] = 'Pravice so bile uspe禳no spremenjene';
+$labels['deletesuccess'] = 'Pravice so bile uspe禳no izbrisane';
+$labels['createsuccess'] = 'Pravice so bile uspe禳no dodane';
+$labels['updateerror'] = 'Pravic ni mogo��e posodobiti';
+$labels['deleteerror'] = 'Pravic ni mogo��e izbrisati';
+$labels['createerror'] = 'Pravic ni bilo mogo��e dodati';
+$labels['deleteconfirm'] = 'Ste prepri��ani, da 鱉elite odstraniti pravice dostopa za izbrane uporabnike?';
+$labels['norights'] = 'Pravic niste dolo��ili';
+$labels['nouser'] = 'Niste dolo��ili uporabni禳lega imena';
+
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
new file mode 100644
index 000000000..a2f41dcaa
--- /dev/null
+++ b/plugins/acl/localization/sv_SE.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jonas Nasholm                                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Utdelning';
+$labels['myrights'] = '��tkomstr瓣ttigheter';
+$labels['username'] = 'Anv瓣ndare:';
+$labels['advanced'] = 'avancerat l瓣ge';
+$labels['newuser'] = 'L瓣gg till';
+$labels['actions'] = 'Hantera 疇tkomstr瓣ttigheter...';
+$labels['anyone'] = 'Alla anv瓣ndare (alla)';
+$labels['anonymous'] = 'G瓣ster (anonyma)';
+$labels['identifier'] = 'Identifikation';
+$labels['acll'] = 'Uppslagning';
+$labels['shortacll'] = 'Uppslagning';
+$labels['aclr'] = 'L瓣s meddelanden';
+$labels['acls'] = 'Beh疇ll status Sett';
+$labels['aclw'] = 'Skriv flaggor';
+$labels['acli'] = 'Infoga (kopiera in)';
+$labels['aclp'] = 'Posta';
+$labels['shortaclp'] = 'Posta';
+$labels['aclc'] = 'Skapa underkataloger';
+$labels['aclk'] = 'Skapa underkataloger';
+$labels['acld'] = 'Ta bort meddelanden';
+$labels['aclt'] = 'Ta bort meddelanden';
+$labels['acle'] = 'Utpl疇na';
+$labels['shortacle'] = 'Utpl疇na';
+$labels['aclx'] = 'Ta bort katalog';
+$labels['acla'] = 'Administrera';
+$labels['shortacla'] = 'Administrera';
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = '��vrig';
+$labels['shortaclother'] = '��vrig';
+$labels['aclread'] = 'L瓣s';
+$labels['shortaclr'] = 'L瓣s';
+$labels['shortaclread'] = 'L瓣s';
+$labels['aclwrite'] = 'Skriv';
+$labels['shortaclw'] = 'Skriv';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['acldelete'] = 'Ta bort';
+$labels['shortacld'] = 'Ta bort';
+$labels['shortaclt'] = 'Ta bort';
+$labels['shortacldelete'] = 'Ta bort';
+$labels['shortacls'] = 'Beh疇ll';
+$labels['shortacli'] = 'Infoga';
+$labels['shortaclc'] = 'Skapa';
+$labels['shortaclk'] = 'Skapa';
+$labels['shortaclx'] = 'Ta bort katalog';
+$labels['longacll'] = 'Katalogen 瓣r synlig i listor och den kan prenumereras p疇';
+$labels['longaclr'] = 'Katalogen kan 繹ppnas f繹r l瓣sning';
+$labels['longaclread'] = 'Katalogen kan 繹ppnas f繹r l瓣sning';
+$labels['longacls'] = 'Meddelandeflagga Sett kan 瓣ndras';
+$labels['longaclw'] = 'Meddelandeflaggor och nyckelord kan 瓣ndras, undantaget Sett och Raderat';
+$labels['longacli'] = 'Meddelanden kan skrivas eller kopieras till katalogen';
+$labels['longaclp'] = 'Meddelanden kan postas till denna katalog';
+$labels['longaclc'] = 'Kataloger kan skapas (eller ges annat namn) direkt i denna katalog';
+$labels['longaclk'] = 'Kataloger kan skapas (eller ges annat namn) direkt i denna katalog';
+$labels['longacld'] = 'Meddelandeflagga Raderat kan 瓣ndras';
+$labels['longaclt'] = 'Meddelandeflagga Raderat kan 瓣ndras';
+$labels['longacle'] = 'Meddelanden kan utpl疇nas';
+$labels['longaclx'] = 'Katalogen kan tas bort eller ges annat namn';
+$labels['longacla'] = 'Katalogens 疇tkomstr瓣ttigheter kan 瓣ndras';
+$labels['longaclfull'] = 'Full kontroll inklusive katalogadministration';
+$labels['longaclwrite'] = 'Meddelanden kan m瓣rkas, skrivas eller kopieras till katalogen';
+$labels['longacldelete'] = 'Meddelanden kan tas bort';
+$labels['deleting'] = 'Tar bort 疇tkomstr瓣ttigheter...';
+$labels['saving'] = 'Sparar 疇tkomstr瓣ttigheter...';
+$labels['updatesuccess'] = '��tkomstr瓣ttigheterna 瓣r 瓣ndrade';
+$labels['deletesuccess'] = '��tkomstr瓣ttigheterna 瓣r borttagna';
+$labels['createsuccess'] = '��tkomstr瓣ttigheterna 瓣r tillagda';
+$labels['updateerror'] = '��tkomstr瓣ttigheterna kunde inte 瓣ndras';
+$labels['deleteerror'] = '��tkomstr瓣ttigheterna kunde inte tas bort';
+$labels['createerror'] = '��tkomstr瓣ttigheterna kunde inte l瓣ggas till';
+$labels['deleteconfirm'] = 'Vill du verkligen ta bort 疇tkomstr瓣ttigheterna f繹r markerade anv瓣ndare?';
+$labels['norights'] = 'Inga 疇tkomstr瓣ttigheter angavs!';
+$labels['nouser'] = 'Inget anv瓣ndarnamn angavs!';
+
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
new file mode 100644
index 000000000..509effaad
--- /dev/null
+++ b/plugins/acl/localization/tr_TR.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Payla��覺m';
+$labels['myrights'] = 'Eri��im Haklar覺';
+$labels['username'] = 'Kullan覺c覺:';
+$labels['advanced'] = '襤leri seviye mod';
+$labels['newuser'] = 'Girdi ekle';
+$labels['actions'] = 'Eri��im haklar覺 aksiyonlar覺...';
+$labels['anyone'] = 'T羹m kullan覺c覺lar(kim olursa)';
+$labels['anonymous'] = 'Ziyaret癟iler(anonim)';
+$labels['identifier'] = 'Tan覺mlay覺c覺';
+$labels['acll'] = 'Arama';
+$labels['shortacll'] = 'Arama';
+$labels['aclr'] = 'Mesajlar覺 oku';
+$labels['acls'] = 'G繹r羹nd羹 durumunu muhafaza et';
+$labels['aclw'] = 'Yazma bayraklar覺';
+$labels['acli'] = 'Ekle(kopyala)';
+$labels['aclp'] = 'G繹nder';
+$labels['shortaclp'] = 'G繹nder';
+$labels['aclc'] = 'Alt dizinler olu��tur';
+$labels['aclk'] = 'Alt dizinler olu��tur';
+$labels['acld'] = 'Mesajlar覺  sil';
+$labels['aclt'] = 'Mesajlar覺  sil';
+$labels['acle'] = 'Sil';
+$labels['shortacle'] = 'Sil';
+$labels['aclx'] = 'Dizini sil';
+$labels['acla'] = 'Y繹net';
+$labels['shortacla'] = 'Y繹net';
+$labels['aclfull'] = 'Tam kontrol';
+$labels['aclother'] = 'Di��er';
+$labels['shortaclother'] = 'Di��er';
+$labels['aclread'] = 'Oku';
+$labels['shortaclr'] = 'Oku';
+$labels['shortaclread'] = 'Oku';
+$labels['aclwrite'] = 'Yaz';
+$labels['shortaclw'] = 'Yaz';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['acldelete'] = 'Sil';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacldelete'] = 'Sil';
+$labels['shortacls'] = 'Koru';
+$labels['shortacli'] = 'Ekle';
+$labels['shortaclc'] = 'Olu��tur';
+$labels['shortaclk'] = 'Olu��tur';
+$labels['shortaclx'] = 'Dizin sil';
+$labels['longacll'] = 'Klas繹r listesinde g繹r羹lebilir ve abone olunabilir';
+$labels['longaclr'] = 'Dizin yazma i癟in okunabilir';
+$labels['longaclread'] = 'Dizin yazma i癟in okunabilir';
+$labels['longacls'] = 'Mesajlar覺n g繹r羹nd羹 bayra��覺 de��i��tirilebilir';
+$labels['longaclw'] = 'G繹r羹lme ve Silinme bayraklar覺 hari癟 bayraklar ve anahtar kelimeler de��i��tirilebilir';
+$labels['longacli'] = 'Mesajlar dizini yaz覺labilir veya kopyalanabilir';
+$labels['longaclp'] = 'Mesajlar bu dizine g繹nderilebilir';
+$labels['longaclc'] = 'Dizinler do��rudan bu klas繹r alt覺nda olu��turulabilir veya yeniden adland覺r覺labilir.';
+$labels['longaclk'] = 'Dizinler do��rudan bu klas繹r alt覺nda olu��turulabilir veya yeniden adland覺r覺labilir.';
+$labels['longacld'] = 'mesajlar覺 sil bayraklar覺 de��i��tirilebilir';
+$labels['longaclt'] = 'mesajlar覺 sil bayraklar覺 de��i��tirilebilir';
+$labels['longacle'] = 'Mesajlar silinebilir';
+$labels['longaclx'] = 'Klas繹r羹 silinebilir veya yeniden adland覺r覺labilir';
+$labels['longacla'] = 'Dizin eri��im haklar覺 de��i��tirilebilir';
+$labels['longaclfull'] = 'Dizin y繹netimi de dahil olmak 羹zere tam kontrol';
+$labels['longaclwrite'] = 'Dizin y繹netimi de dahil olmak 羹zere tam kontrol';
+$labels['longacldelete'] = 'Mesajlar silinebilir';
+$labels['deleting'] = 'Eri��im haklar覺 siliniyor...';
+$labels['saving'] = 'Eri��im haklar覺 saklan覺yor...';
+$labels['updatesuccess'] = 'Eri��im haklar覺 ba��ar覺yla de��i��tirildi';
+$labels['deletesuccess'] = 'Eri��im haklar覺 ba��ar覺yla silindi';
+$labels['createsuccess'] = 'Eri��im haklar覺 ba��ar覺yla eklendi';
+$labels['updateerror'] = 'Eri��im haklar覺n覺 g羹ncellenemedi';
+$labels['deleteerror'] = 'Eri��im haklar覺n覺 silinemedi';
+$labels['createerror'] = 'Eri��im haklar覺 eklenemedi';
+$labels['deleteconfirm'] = 'Se癟ilen kullan覺c覺lar i癟in eri��im haklar覺n覺 silmek istedi��inizden emin misiniz?';
+$labels['norights'] = 'Hi癟bir hak belirtilmemi��!';
+$labels['nouser'] = 'Hi癟bir kullan覺c覺 belirtilmemi��!';
+
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
new file mode 100644
index 000000000..66dc1eb50
--- /dev/null
+++ b/plugins/acl/localization/vi_VN.inc
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/vi_VN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hung Pham <phamhung77@gmail.com>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Chia s廕�';
+$labels['myrights'] = 'Quy廙�n truy c廕計';
+$labels['username'] = 'Ngが廙�i d羅ng:';
+$labels['newuser'] = 'Th礙m b��i vi廕篙';
+$labels['anyone'] = 'T廕另 c廕� ngが廙�i d羅ng (b廕另 k廙� ai)';
+$labels['anonymous'] = 'Kh獺ch (v繫 h穫nh)';
+$labels['acll'] = 'T穫m ki廕禦';
+$labels['shortacll'] = 'T穫m ki廕禦';
+$labels['aclr'] = '��廙�c thが';
+$labels['acli'] = 'Che��n th礙m (sao che��p va��o)';
+$labels['aclp'] = '����ng b��i';
+$labels['shortaclp'] = '����ng b��i';
+$labels['aclc'] = 'Kh廙�i t廕︽ thが m廙卉 con';
+$labels['aclk'] = 'Kh廙�i t廕︽ thが m廙卉 con';
+$labels['acld'] = 'X籀a thが';
+$labels['aclt'] = 'X籀a thが';
+$labels['aclx'] = 'X籀a folder';
+$labels['acla'] = 'Qu廕τ l羸';
+$labels['shortacla'] = 'Qu廕τ l羸';
+$labels['aclfull'] = 'Qu廕τ l羸 to��n b廙�';
+$labels['aclother'] = 'Lo廕【 kh獺c';
+$labels['shortaclother'] = 'Lo廕【 kh獺c';
+$labels['aclread'] = '��廙�c';
+$labels['shortaclr'] = '��廙�c';
+$labels['shortaclread'] = '��廙�c';
+$labels['aclwrite'] = 'Vi廕篙';
+$labels['shortaclw'] = 'Vi廕篙';
+$labels['shortaclwrite'] = 'Vi廕篙';
+$labels['acldelete'] = 'Xo獺';
+$labels['shortacld'] = 'Xo獺';
+$labels['shortaclt'] = 'Xo獺';
+$labels['shortacldelete'] = 'Xo獺';
+$labels['shortacls'] = 'Gi廙�';
+$labels['shortacli'] = 'Ch癡n';
+$labels['shortaclc'] = 'T廕︽ m廙�i';
+$labels['shortaclk'] = 'T廕︽ m廙�i';
+$labels['longacll'] = 'Thが mu怗c co�� s����n trong danh sa��ch va�� co�� th礙�� gが��i tヾ��i';
+$labels['longaclr'] = 'Folder c籀 th廙� ��が廙θ m廙� ��廙� ��廙�c';
+$labels['longaclread'] = 'Folder c籀 th廙� ��が廙θ m廙� ��廙� ��廙�c';
+$labels['longacli'] = 'Thが c籀 th廙� ��が廙θ ghi ho廕搾 sao ch矇p t廙�i thが m廙卉';
+$labels['longaclp'] = 'Thが co�� th礙��';
+$labels['longaclc'] = 'C獺cthが m廙卉 c籀 th廙� ��が廙θ t廕︽ (ho廕搾 ��廕暗 l廕【 t礙n) tr廙帷 ti廕穆 dが廙�i thが m廙卉 n��y';
+$labels['longaclk'] = 'C獺cthが m廙卉 c籀 th廙� ��が廙θ t廕︽ (ho廕搾 ��廕暗 l廕【 t礙n) tr廙帷 ti廕穆 dが廙�i thが m廙卉 n��y';
+$labels['longaclx'] = 'Folder c籀 th廙� x籀a ��が廙θ ho廕搾 ��廕暗 l廕【 t礙n';
+$labels['longacla'] = 'Quy礙nf truy c廕計 folder c籀 th廙� thay ��廙�i';
+$labels['longaclfull'] = 'Qu廕τ l羸 to��n b廙� bao g廙�m c廕� thが m廙卉 h��nh ch穩nh';
+$labels['longaclwrite'] = 'Thが c籀 th廙� ��が廙θ ��獺nh d廕只, ghi ho��c sao ch矇p t廙�i thが m廙卉';
+$labels['longacldelete'] = 'Thが c籀 th廙� b廙� x籀a';
+$labels['deleting'] = 'X籀a quy廙�n truy c廕計...';
+$labels['saving'] = 'Lがu quy廙�n truy c廕計...';
+$labels['updatesuccess'] = 'Thay ��廙�i quy廙�n truy c廕計 th��nh c繫ng...';
+$labels['deletesuccess'] = 'X籀a quy廙�n truy c廕計 th��nh c繫ng...';
+$labels['createsuccess'] = 'Th礙m quy廙�n truy c廕計 th��nh c繫ng...';
+$labels['deleteerror'] = 'Kh繫ngth廙� x籀a quy廙�n truy c廕計';
+$labels['deleteconfirm'] = 'B廕》 c籀 ch廕畚 l�� mu廙�n x籀a b廙� quy廙�n truy c廕計 c廙吧 ngが廙�i d羅ng ��が廙θ ch廙�n?';
+
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
new file mode 100644
index 000000000..c58296ac9
--- /dev/null
+++ b/plugins/acl/localization/zh_TW.inc
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nansen                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '���鈭�';
+$labels['myrights'] = '摮����甈����';
+$labels['username'] = '雿輻�刻��嚗�';
+$labels['advanced'] = '��脤��璅∪��';
+$labels['newuser'] = '��啣��������';
+$labels['actions'] = '甈����閮剖��';
+$labels['anyone'] = '������雿輻�刻�� (anyone)';
+$labels['anonymous'] = '閮芸恥 (anonymous)';
+$labels['identifier'] = '霅����';
+$labels['acll'] = '撠����';
+$labels['shortacll'] = '撠����';
+$labels['aclr'] = '霈����閮����';
+$labels['aclw'] = '撖怠�交��撟�';
+$labels['aclp'] = '��潸”';
+$labels['shortaclp'] = '��潸”';
+$labels['aclc'] = '撱箇��摮�鞈����憭�';
+$labels['aclk'] = '撱箇��摮�鞈����憭�';
+$labels['acld'] = '��芷�方�����';
+$labels['aclt'] = '��芷�方�����';
+$labels['acle'] = '��芸��';
+$labels['shortacle'] = '��芸��';
+$labels['aclx'] = '��芷�方�����憭�';
+$labels['acla'] = '蝞∠�����';
+$labels['shortacla'] = '蝞∠�����';
+$labels['aclfull'] = '摰���冽�批��';
+$labels['aclother'] = '��嗅��';
+$labels['shortaclother'] = '��嗅��';
+$labels['aclread'] = '霈����';
+$labels['shortaclr'] = '霈����';
+$labels['shortaclread'] = '霈����';
+$labels['aclwrite'] = '撖怠��';
+$labels['shortaclw'] = '撖怠��';
+$labels['shortaclwrite'] = '撖怠��';
+$labels['acldelete'] = '��芷��';
+$labels['shortacld'] = '��芷��';
+$labels['shortaclt'] = '��芷��';
+$labels['shortacldelete'] = '��芷��';
+$labels['shortacls'] = '靽�摮�';
+$labels['shortacli'] = '������';
+$labels['shortaclc'] = '撱箇��';
+$labels['shortaclk'] = '撱箇��';
+$labels['shortaclx'] = '鞈����憭曉�芷��';
+$labels['longaclr'] = '鞈����憭曇�質◤���������霈����';
+$labels['longaclread'] = '鞈����憭曇�質◤���������霈����';
+$labels['longacls'] = '��賭耨��寡����舀��撟�';
+$labels['longacli'] = '閮���航�賢神��交��銴�鋆賢�啗�����憭�';
+$labels['longaclp'] = '閮���航�質◤��������圈�����鞈����憭�';
+$labels['longacld'] = '��賭耨��寡����臬�芷�斗��撟�';
+$labels['longaclt'] = '��賭耨��寡����臬�芷�斗��撟�';
+$labels['longacle'] = '��賣�寥�方�����';
+$labels['longaclx'] = '鞈����憭曇�質◤��芷�斗�������啣�賢��';
+$labels['longacla'] = '��質����渲�����憭暹�����';
+$labels['longaclfull'] = '摰���冽�批�嗅����怨�����憭曄恣������';
+$labels['longacldelete'] = '閮���航�質◤��芷��';
+$labels['deleting'] = '��芷�斗�����...';
+$labels['saving'] = '��脣��甈����...';
+$labels['updatesuccess'] = '甈����霈���游�����';
+$labels['deletesuccess'] = '甈������芷�文�����';
+$labels['createsuccess'] = '甈������啣��摰����';
+$labels['updateerror'] = '��⊥����湔�唳�����';
+$labels['deleteerror'] = '��⊥����芷�斗�����';
+$labels['createerror'] = '��⊥����啣��甈����';
+$labels['deleteconfirm'] = '��函Ⅱ摰�閬���芷�斗����詨��雿輻�刻�����甈�������?';
+
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index bb257bca0..28a41913b 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -1,25 +1,21 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube archive plugin                         |
-| Copyright (C) 2005-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archiv';
+$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zpr獺vu';
 $labels['archived'] = '��sp��禳n�� vlo鱉eno do archivu';
-$labels['archivefolder'] = 'Archiv';
 
-?>
diff --git a/plugins/archive/localization/de_CH.inc b/plugins/archive/localization/de_CH.inc
index 2ed0f5ac8..bae441305 100644
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Archiv';
+$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
-$labels['archivefolder'] = 'Archiv';
 
-?>
diff --git a/plugins/archive/localization/de_DE.inc b/plugins/archive/localization/de_DE.inc
index 2ed0f5ac8..c525837fd 100644
--- a/plugins/archive/localization/de_DE.inc
+++ b/plugins/archive/localization/de_DE.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Archiv';
+$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
-$labels['archivefolder'] = 'Archiv';
 
-?>
diff --git a/plugins/archive/localization/es_AR.inc b/plugins/archive/localization/es_AR.inc
index 7d021f561..39466a980 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -1,10 +1,21 @@
 <?php
 
-// MPBAUPGRADE
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_AR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
+$labels['buttontext'] = 'Archivo';
+$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
-$labels['archivefolder'] = 'Archivo';
 
-?>
diff --git a/plugins/archive/localization/es_ES.inc b/plugins/archive/localization/es_ES.inc
index 7d021f561..7cd5917c6 100644
--- a/plugins/archive/localization/es_ES.inc
+++ b/plugins/archive/localization/es_ES.inc
@@ -1,10 +1,21 @@
 <?php
 
-// MPBAUPGRADE
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
+$labels['buttontext'] = 'Archivo';
+$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
-$labels['archivefolder'] = 'Archivo';
 
-?>
diff --git a/plugins/archive/localization/et_EE.inc b/plugins/archive/localization/et_EE.inc
index e3968d755..53e9b2504 100644
--- a/plugins/archive/localization/et_EE.inc
+++ b/plugins/archive/localization/et_EE.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Arhiveeri';
+$labels['archivefolder'] = 'Arhiveeri';
 $labels['buttontitle'] = 'Arhiveeri see kiri';
 $labels['archived'] = 'Edukalt arhiveeritud';
-$labels['archivefolder'] = 'Arhiveeri';
 
-?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
index 498a091fe..35434dac1 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Archive';
+$labels['archivefolder'] = 'Archive';
 $labels['buttontitle'] = 'Archiver ce message';
 $labels['archived'] = 'Message archiv矇 avec success';
-$labels['archivefolder'] = 'Archive';
 
-?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 6f580f844..1e6c620f9 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas <Unknown>                                                |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['buttontitle'] = 'Arquivar esta mensaxe';
-$labels['archived'] = 'Arquivado correctamente';
+$labels['buttontext'] = 'Arquivo';
 $labels['archivefolder'] = 'Arquivo';
+$labels['buttontitle'] = 'Arquivar esta mensaxe';
+$labels['archived'] = 'Aquivouse a mensaxe';
 
diff --git a/plugins/archive/localization/hy_AM.inc b/plugins/archive/localization/hy_AM.inc
new file mode 100644
index 000000000..ff29d198c
--- /dev/null
+++ b/plugins/archive/localization/hy_AM.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = '埜��晜晛桴';
+$labels['archivefolder'] = '埜��晜晛桴';
+$labels['buttontitle'] = '埜��晜晛桴捸��梮掍晙 捸桮桵 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['archived'] = '埴捸��掍桹捸梬楖梐 捸��晜晛桴捸��桴掍��';
+
diff --git a/plugins/archive/localization/ja_JP.inc b/plugins/archive/localization/ja_JP.inc
index 647f70f9f..1de4de0d1 100644
--- a/plugins/archive/localization/ja_JP.inc
+++ b/plugins/archive/localization/ja_JP.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
+ | Author: Takahiro Kambe                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '��Ｕ�潦�怒�扎��';
+$labels['archivefolder'] = '��Ｕ�潦�怒�扎��';
 $labels['buttontitle'] = '�����柴�∼����颯�潦�詻����Ｕ�潦�怒�扎��';
 $labels['archived'] = '��Ｕ�潦�怒�扎�������整��������';
-$labels['archivefolder'] = '��Ｕ�潦�怒�扎��';
 
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
new file mode 100644
index 000000000..b067356a6
--- /dev/null
+++ b/plugins/archive/localization/ko_KR.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = '貐湊��';
+$labels['archivefolder'] = '貐湊��';
+$labels['buttontitle'] = '��� 諰����鴔�諝� 貐湊��';
+$labels['archived'] = '��梓陬�����潺�� 貐湊�� ���';
+
diff --git a/plugins/archive/localization/nl_NL.inc b/plugins/archive/localization/nl_NL.inc
index 0d47f7b9c..44f671239 100644
--- a/plugins/archive/localization/nl_NL.inc
+++ b/plugins/archive/localization/nl_NL.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Archief';
+$labels['archivefolder'] = 'Archief';
 $labels['buttontitle'] = 'Archiveer dit bericht';
 $labels['archived'] = 'Succesvol gearchiveerd';
-$labels['archivefolder'] = 'Archief';
 
-?>
diff --git a/plugins/archive/localization/pl_PL.inc b/plugins/archive/localization/pl_PL.inc
index c0d58d311..1e6ff0b44 100644
--- a/plugins/archive/localization/pl_PL.inc
+++ b/plugins/archive/localization/pl_PL.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archiwum';
+$labels['archivefolder'] = 'Archiwum';
 $labels['buttontitle'] = 'Przenie�� do archiwum';
 $labels['archived'] = 'Pomy��lnie zarchiwizowano';
-$labels['archivefolder'] = 'Archiwum';
 
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index 224f53caa..1991290eb 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Arquivo';
+$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
-$labels['archivefolder'] = 'Arquivo';
 
-?>
diff --git a/plugins/archive/localization/ru_RU.inc b/plugins/archive/localization/ru_RU.inc
index e377ad017..6fd1dab28 100644
--- a/plugins/archive/localization/ru_RU.inc
+++ b/plugins/archive/localization/ru_RU.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = '������邽赲';
+$labels['archivefolder'] = '������邽赲';
 $labels['buttontitle'] = '��迮��迮邾迮����邽���� 赲��訇��訄郇郇郋迮 赲 訄����邽赲';
 $labels['archived'] = '��迮��迮郇迮��迮郇郋 赲 ������邽赲';
-$labels['archivefolder'] = '������邽赲';
 
-?>
diff --git a/plugins/archive/localization/sr_CS.inc b/plugins/archive/localization/sr_CS.inc
new file mode 100644
index 000000000..81128c4ca
--- /dev/null
+++ b/plugins/archive/localization/sr_CS.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Arhiva';
+$labels['archivefolder'] = 'Arhiva';
+$labels['buttontitle'] = 'Arhivirati ovu poruku';
+$labels['archived'] = 'Usp��禳no arhivirano';
+
diff --git a/plugins/archive/localization/sv_SE.inc b/plugins/archive/localization/sv_SE.inc
index c55da7aaf..13d0cf007 100644
--- a/plugins/archive/localization/sv_SE.inc
+++ b/plugins/archive/localization/sv_SE.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jonas Nasholm                                                 |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = 'Arkiv';
+$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivera meddelande';
 $labels['archived'] = 'Meddelandet 瓣r arkiverat';
-$labels['archivefolder'] = 'Arkiv';
 
-?>
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
index 5cccebbdc..0f6e9b943 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -1,8 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
+$labels['buttontext'] = '撠�摮�';
+$labels['archivefolder'] = '撠�摮�';
 $labels['buttontitle'] = '撠�摮�甇支縑隞�';
 $labels['archived'] = '撌脫�����撠�摮�';
-$labels['archivefolder'] = '撠�摮�';
 
-?>
diff --git a/plugins/help/localization/bs_BA.inc b/plugins/help/localization/bs_BA.inc
new file mode 100644
index 000000000..714d4e775
--- /dev/null
+++ b/plugins/help/localization/bs_BA.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Pomo��';
+$labels['about'] = 'O programu';
+$labels['license'] = 'Licenca';
+
diff --git a/plugins/help/localization/ca_ES.inc b/plugins/help/localization/ca_ES.inc
new file mode 100644
index 000000000..bd45469cd
--- /dev/null
+++ b/plugins/help/localization/ca_ES.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Ajuda';
+$labels['about'] = 'Quant a';
+$labels['license'] = 'Llic癡ncia';
+
diff --git a/plugins/help/localization/cy_GB.inc b/plugins/help/localization/cy_GB.inc
new file mode 100644
index 000000000..78969b9d2
--- /dev/null
+++ b/plugins/help/localization/cy_GB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Dafydd Tomos                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Cymorth';
+$labels['about'] = 'Amdan';
+$labels['license'] = 'Trwydded';
+
diff --git a/plugins/help/localization/de_CH.inc b/plugins/help/localization/de_CH.inc
new file mode 100644
index 000000000..ee9c78634
--- /dev/null
+++ b/plugins/help/localization/de_CH.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Hilfe';
+$labels['about'] = 'Information';
+$labels['license'] = 'Lizenz';
+
diff --git a/plugins/help/localization/fa_IR.inc b/plugins/help/localization/fa_IR.inc
new file mode 100644
index 000000000..5635d70bf
--- /dev/null
+++ b/plugins/help/localization/fa_IR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_IR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hamid <abbaszadeh.h@gmail.com>                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '堭塈������塈';
+$labels['about'] = '堹堭堥塈堭��';
+$labels['license'] = '痧��塈������塈����';
+
diff --git a/plugins/help/localization/fi_FI.inc b/plugins/help/localization/fi_FI.inc
new file mode 100644
index 000000000..3ca3da356
--- /dev/null
+++ b/plugins/help/localization/fi_FI.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Gr繹nroos                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Ohje';
+$labels['about'] = 'Tietoja';
+$labels['license'] = 'Lisenssi';
+
diff --git a/plugins/help/localization/fr_FR.inc b/plugins/help/localization/fr_FR.inc
new file mode 100644
index 000000000..269723972
--- /dev/null
+++ b/plugins/help/localization/fr_FR.inc
@@ -0,0 +1,8 @@
+<?php
+
+$labels = array();
+$labels['help'] = 'Aide';
+$labels['about'] = 'A propos';
+$labels['license'] = 'Licence';
+
+?>
diff --git a/plugins/help/localization/he_IL.inc b/plugins/help/localization/he_IL.inc
new file mode 100644
index 000000000..105acbd16
--- /dev/null
+++ b/plugins/help/localization/he_IL.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '蛁��蚳��';
+$labels['about'] = '��������蛌';
+$labels['license'] = '蚳蚸������';
+
diff --git a/plugins/help/localization/hy_AM.inc b/plugins/help/localization/hy_AM.inc
new file mode 100644
index 000000000..7e56fda1b
--- /dev/null
+++ b/plugins/help/localization/hy_AM.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '��掁梮楖��晥桮楖��梮';
+$labels['about'] = '��朘捸��捸掁晛��';
+$labels['license'] = '埜��梲楖梮捸掁晛��';
+
diff --git a/plugins/help/localization/ja_JP.inc b/plugins/help/localization/ja_JP.inc
index 18081bb7d..a41a3b103 100644
--- a/plugins/help/localization/ja_JP.inc
+++ b/plugins/help/localization/ja_JP.inc
@@ -1,10 +1,20 @@
 <?php
 
-//  EN-Revision: 3891
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Takahiro Kambe                                                |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
 $labels['help'] = '�����怒��';
-$labels['about'] = '蝝嫣��';
+$labels['about'] = '�����柴����准�啜�押����怒�扎�����';
 $labels['license'] = '��押�扎�颯�喋��';
 
-?>
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
new file mode 100644
index 000000000..c57dfa0f5
--- /dev/null
+++ b/plugins/help/localization/ko_KR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '������諤�';
+$labels['about'] = '���貐�';
+$labels['license'] = '��潰�渥�潰��';
+
diff --git a/plugins/help/localization/lt_LT.inc b/plugins/help/localization/lt_LT.inc
new file mode 100644
index 000000000..a7a2b827d
--- /dev/null
+++ b/plugins/help/localization/lt_LT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Rimas Kudelis <rq@akl.lt>                                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '鬚inynas';
+$labels['about'] = 'Apie';
+$labels['license'] = 'Licencija';
+
diff --git a/plugins/help/localization/nl_NL.inc b/plugins/help/localization/nl_NL.inc
new file mode 100644
index 000000000..6fdf8d4cb
--- /dev/null
+++ b/plugins/help/localization/nl_NL.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Help';
+$labels['about'] = 'Over';
+$labels['license'] = 'Licentie';
+
diff --git a/plugins/help/localization/pt_PT.inc b/plugins/help/localization/pt_PT.inc
new file mode 100644
index 000000000..c28503b33
--- /dev/null
+++ b/plugins/help/localization/pt_PT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Ajuda';
+$labels['about'] = 'Sobre...';
+$labels['license'] = 'Licen癟a';
+
diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc
new file mode 100644
index 000000000..6fdacd1b6
--- /dev/null
+++ b/plugins/help/localization/sk_SK.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: panda                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'N獺poveda';
+$labels['about'] = 'O aplik獺cii';
+$labels['license'] = 'Licencia';
+
diff --git a/plugins/help/localization/sl_SI.inc b/plugins/help/localization/sl_SI.inc
new file mode 100644
index 000000000..d72cd1838
--- /dev/null
+++ b/plugins/help/localization/sl_SI.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Barbara Krasovec <barbarak@arnes.si>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Pomo��';
+$labels['about'] = 'Vizitka';
+$labels['license'] = 'Licenca';
+
diff --git a/plugins/help/localization/sr_CS.inc b/plugins/help/localization/sr_CS.inc
new file mode 100644
index 000000000..b0499f0ec
--- /dev/null
+++ b/plugins/help/localization/sr_CS.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '��郋邾郋��';
+$labels['about'] = 'Info';
+$labels['license'] = 'Licenca';
+
diff --git a/plugins/help/localization/tr_TR.inc b/plugins/help/localization/tr_TR.inc
new file mode 100644
index 000000000..306c1c462
--- /dev/null
+++ b/plugins/help/localization/tr_TR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Yard覺m';
+$labels['about'] = 'Hakk覺nda';
+$labels['license'] = 'Lisans';
+
diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc
new file mode 100644
index 000000000..9c737464e
--- /dev/null
+++ b/plugins/help/localization/vi_VN.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/vi_VN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hung Pham <phamhung77@gmail.com>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Tr廙� gi繳p';
+$labels['about'] = 'Gi廙�i thi廙�u';
+$labels['license'] = 'B廕τ quy廙�n';
+
diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
new file mode 100644
index 000000000..da7b7a8c6
--- /dev/null
+++ b/plugins/help/localization/zh_CN.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = '撣桀��';
+$labels['about'] = '��喃��';
+$labels['license'] = '霈詨�臬��霈�';
+
diff --git a/plugins/hide_blockquote/localization/bs_BA.inc b/plugins/hide_blockquote/localization/bs_BA.inc
new file mode 100644
index 000000000..ae9bda580
--- /dev/null
+++ b/plugins/hide_blockquote/localization/bs_BA.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Sakrij';
+$labels['show'] = 'Prika鱉i';
+$labels['quotelimit'] = 'Sakrij citate kada je broj linija ve��i od';
+
diff --git a/plugins/hide_blockquote/localization/ca_ES.inc b/plugins/hide_blockquote/localization/ca_ES.inc
new file mode 100644
index 000000000..d8ca7c919
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ca_ES.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Amaga';
+$labels['show'] = 'Mostra';
+$labels['quotelimit'] = 'Amaga la cita quan el nombre de l穩nies sigui m矇s gran de';
+
diff --git a/plugins/hide_blockquote/localization/cs_CZ.inc b/plugins/hide_blockquote/localization/cs_CZ.inc
new file mode 100644
index 000000000..22b2e87e1
--- /dev/null
+++ b/plugins/hide_blockquote/localization/cs_CZ.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Tom獺禳 Kyzlink                                               |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Skr羸t';
+$labels['show'] = 'Zobrazit';
+$labels['quotelimit'] = 'Skr羸t citaci pokud je po��et ��獺dk轡 v��t禳穩 ne鱉';
+
diff --git a/plugins/hide_blockquote/localization/cy_GB.inc b/plugins/hide_blockquote/localization/cy_GB.inc
new file mode 100644
index 000000000..40b0ec207
--- /dev/null
+++ b/plugins/hide_blockquote/localization/cy_GB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Dafydd Tomos                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Cuddio';
+$labels['show'] = 'Dangos';
+$labels['quotelimit'] = 'Cuddio dyfynniad pan mae\'r nifer o linellau yn fwy na';
+
diff --git a/plugins/hide_blockquote/localization/da_DK.inc b/plugins/hide_blockquote/localization/da_DK.inc
new file mode 100644
index 000000000..50fbc718d
--- /dev/null
+++ b/plugins/hide_blockquote/localization/da_DK.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Johannes Hessellund <osos@openeyes.dk>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Skjul';
+$labels['show'] = 'Vis';
+$labels['quotelimit'] = 'Skjul citat antallet af linjer er h繪jere end';
+
diff --git a/plugins/hide_blockquote/localization/de_CH.inc b/plugins/hide_blockquote/localization/de_CH.inc
new file mode 100644
index 000000000..26b8707f7
--- /dev/null
+++ b/plugins/hide_blockquote/localization/de_CH.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'ausblenden';
+$labels['show'] = 'einblenden';
+$labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenl瓣nge von';
+
diff --git a/plugins/hide_blockquote/localization/de_DE.inc b/plugins/hide_blockquote/localization/de_DE.inc
new file mode 100644
index 000000000..4ae3b96e7
--- /dev/null
+++ b/plugins/hide_blockquote/localization/de_DE.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'ausblenden';
+$labels['show'] = 'einblenden';
+$labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenl瓣nge von';
+
diff --git a/plugins/hide_blockquote/localization/en_GB.inc b/plugins/hide_blockquote/localization/en_GB.inc
new file mode 100644
index 000000000..68f634e00
--- /dev/null
+++ b/plugins/hide_blockquote/localization/en_GB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Hide';
+$labels['show'] = 'Show';
+$labels['quotelimit'] = 'Hide citation when lines count is greater than';
+
diff --git a/plugins/hide_blockquote/localization/es_ES.inc b/plugins/hide_blockquote/localization/es_ES.inc
new file mode 100644
index 000000000..485fef551
--- /dev/null
+++ b/plugins/hide_blockquote/localization/es_ES.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Eduardo Alberto Calvo                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Ocultar';
+$labels['show'] = 'Mostrar';
+$labels['quotelimit'] = 'Ocultar la cita cuando el numero de lineas es mayor que';
+
diff --git a/plugins/hide_blockquote/localization/fi_FI.inc b/plugins/hide_blockquote/localization/fi_FI.inc
new file mode 100644
index 000000000..ada6d754a
--- /dev/null
+++ b/plugins/hide_blockquote/localization/fi_FI.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Gr繹nroos                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Piilota';
+$labels['show'] = 'N瓣yt瓣';
+$labels['quotelimit'] = 'Piilota lainaus, kun rivien lukum瓣瓣r瓣 on suurempi kuin';
+
diff --git a/plugins/hide_blockquote/localization/fr_FR.inc b/plugins/hide_blockquote/localization/fr_FR.inc
new file mode 100644
index 000000000..5964186af
--- /dev/null
+++ b/plugins/hide_blockquote/localization/fr_FR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Patrick Fiquet                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Cacher';
+$labels['show'] = 'Afficher';
+$labels['quotelimit'] = 'Cacher la citation quand le nombre de lignes est plus grand que';
+
diff --git a/plugins/hide_blockquote/localization/gl_ES.inc b/plugins/hide_blockquote/localization/gl_ES.inc
new file mode 100644
index 000000000..bb45812cc
--- /dev/null
+++ b/plugins/hide_blockquote/localization/gl_ES.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: oterobueu <oterobueu@gmail.com>                               |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Agochar';
+$labels['show'] = 'Amosar';
+$labels['quotelimit'] = 'Agochar menci籀ns cando haxa demasiadas li簽as';
+
diff --git a/plugins/hide_blockquote/localization/he_IL.inc b/plugins/hide_blockquote/localization/he_IL.inc
new file mode 100644
index 000000000..9ddc6bd2a
--- /dev/null
+++ b/plugins/hide_blockquote/localization/he_IL.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '��蛂蛌蚳';
+$labels['show'] = '��蛈��';
+$labels['quotelimit'] = '��蛂蛌蚳 蛈�������� ����蚸蚳 ��蛂蚺蚳 ��蚸��蚳��蛌 �������� ��-';
+
diff --git a/plugins/hide_blockquote/localization/hu_HU.inc b/plugins/hide_blockquote/localization/hu_HU.inc
new file mode 100644
index 000000000..a3418f4a6
--- /dev/null
+++ b/plugins/hide_blockquote/localization/hu_HU.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: bela                                                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Elrejt矇s';
+$labels['show'] = 'Megjelen穩t矇s';
+$labels['quotelimit'] = 'Id矇zet elrejt矇se ha a sorok sz獺ma t繹bb mint';
+
diff --git a/plugins/hide_blockquote/localization/hy_AM.inc b/plugins/hide_blockquote/localization/hy_AM.inc
new file mode 100644
index 000000000..8aa5f2d12
--- /dev/null
+++ b/plugins/hide_blockquote/localization/hy_AM.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '埳捸����梮掍晙';
+$labels['show'] = '��楖����捸掑��掍晙';
+$labels['quotelimit'] = '埳捸����梮掍晙 ��晛梲楖��桭旍 掍��掅 梲楖梐掍��晛 ��捸梮捸朘旍 掁掍��捸捰捸梮��楖��桭 敓';
+
diff --git a/plugins/hide_blockquote/localization/ja_JP.inc b/plugins/hide_blockquote/localization/ja_JP.inc
new file mode 100644
index 000000000..3fbbb2806
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ja_JP.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Takahiro Kambe                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '������';
+$labels['show'] = '銵函內';
+$labels['quotelimit'] = '甈∼�株����啜�����憭����撘���具�����銵函內';
+
diff --git a/plugins/hide_blockquote/localization/ko_KR.inc b/plugins/hide_blockquote/localization/ko_KR.inc
new file mode 100644
index 000000000..d83dd8bce
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ko_KR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '��刷萼篣�';
+$labels['show'] = '貐渥�湊萼';
+$labels['quotelimit'] = '��潰�� 穈����穈� �����渥�� 穈����貐渠�� ��� ��� ��賄�抱筋 穈�黺�篣�';
+
diff --git a/plugins/hide_blockquote/localization/lt_LT.inc b/plugins/hide_blockquote/localization/lt_LT.inc
new file mode 100644
index 000000000..159f1747d
--- /dev/null
+++ b/plugins/hide_blockquote/localization/lt_LT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Rimas Kudelis <rq@akl.lt>                                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Pasl��pti';
+$labels['show'] = 'Parodyti';
+$labels['quotelimit'] = 'Pasl��pti citat��, kai joje eilu��i鑒 daugiau negu';
+
diff --git a/plugins/hide_blockquote/localization/nl_NL.inc b/plugins/hide_blockquote/localization/nl_NL.inc
new file mode 100644
index 000000000..1e14835e0
--- /dev/null
+++ b/plugins/hide_blockquote/localization/nl_NL.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Verbergen';
+$labels['show'] = 'Tonen';
+$labels['quotelimit'] = 'Verberg citaat wanneer aantal regels groter is dan';
+
diff --git a/plugins/hide_blockquote/localization/pt_BR.inc b/plugins/hide_blockquote/localization/pt_BR.inc
new file mode 100644
index 000000000..3acdd4534
--- /dev/null
+++ b/plugins/hide_blockquote/localization/pt_BR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Ocultar';
+$labels['show'] = 'Exibir';
+$labels['quotelimit'] = 'Ocultar a cita癟瓊o quando o n繳mero de linhas for maior do que';
+
diff --git a/plugins/hide_blockquote/localization/pt_PT.inc b/plugins/hide_blockquote/localization/pt_PT.inc
new file mode 100644
index 000000000..8afa6d549
--- /dev/null
+++ b/plugins/hide_blockquote/localization/pt_PT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Ocultar';
+$labels['show'] = 'Mostrar';
+$labels['quotelimit'] = 'Ocultar cita癟瓊o quando o numero de linhas for maior que';
+
diff --git a/plugins/hide_blockquote/localization/ru_RU.inc b/plugins/hide_blockquote/localization/ru_RU.inc
new file mode 100644
index 000000000..ab7733e0d
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ru_RU.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sergey Dukachev <admin@mfitness.ru>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '苤郕��������';
+$labels['show'] = '��郋郕訄郱訄����';
+$labels['quotelimit'] = '苤郕�������� ��邽��訄����, 迮��郅邽 ��邽��郅郋 ������郋郕 訇郋郅迮迮 ��迮邾';
+
diff --git a/plugins/hide_blockquote/localization/sk_SK.inc b/plugins/hide_blockquote/localization/sk_SK.inc
new file mode 100644
index 000000000..e9263833b
--- /dev/null
+++ b/plugins/hide_blockquote/localization/sk_SK.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: panda                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Skry聽';
+$labels['show'] = 'Zobrazi聽';
+$labels['quotelimit'] = 'Skry聽 cit獺ciu pokia躂 je po��et riadkov v瓣��禳穩 ne鱉';
+
diff --git a/plugins/hide_blockquote/localization/sl_SI.inc b/plugins/hide_blockquote/localization/sl_SI.inc
new file mode 100644
index 000000000..31cfc3caa
--- /dev/null
+++ b/plugins/hide_blockquote/localization/sl_SI.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Barbara Krasovec <barbarak@arnes.si>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Skrij';
+$labels['show'] = 'Prika鱉i';
+$labels['quotelimit'] = 'Skrij citiran tekst, ko je 禳tevilo vrstic ve��je od';
+
diff --git a/plugins/hide_blockquote/localization/sr_CS.inc b/plugins/hide_blockquote/localization/sr_CS.inc
new file mode 100644
index 000000000..485ef5966
--- /dev/null
+++ b/plugins/hide_blockquote/localization/sr_CS.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '苤訄郕��邽��';
+$labels['show'] = '����邽郕訄迠邽';
+$labels['quotelimit'] = '苤訄郕��邽�� ��邽��訄�� 郕訄迡訄 ��迮 訇��郋�� ��迮迡郋赲訄 赲迮��邽 郋迡';
+
diff --git a/plugins/hide_blockquote/localization/sv_SE.inc b/plugins/hide_blockquote/localization/sv_SE.inc
new file mode 100644
index 000000000..c6abb488f
--- /dev/null
+++ b/plugins/hide_blockquote/localization/sv_SE.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jonas Nasholm                                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'D繹lj';
+$labels['show'] = 'Visa';
+$labels['quotelimit'] = 'D繹lj citat n瓣r antalet rader 繹verstiger';
+
diff --git a/plugins/hide_blockquote/localization/tr_TR.inc b/plugins/hide_blockquote/localization/tr_TR.inc
new file mode 100644
index 000000000..525ec5064
--- /dev/null
+++ b/plugins/hide_blockquote/localization/tr_TR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Gizle';
+$labels['show'] = 'G繹ster';
+$labels['quotelimit'] = 'Sat覺r say覺s覺 ��u sat覺r say覺s覺ndna fazla ile al覺nt覺lar覺 gizle:';
+
diff --git a/plugins/hide_blockquote/localization/vi_VN.inc b/plugins/hide_blockquote/localization/vi_VN.inc
new file mode 100644
index 000000000..fc2cb5011
--- /dev/null
+++ b/plugins/hide_blockquote/localization/vi_VN.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/vi_VN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hung Pham <phamhung77@gmail.com>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '廕盯';
+$labels['show'] = 'Hi廙�n th廙�';
+$labels['quotelimit'] = '廕盯 tr穩ch d廕南 khi t廙�ng s廙� d簷ng l廙�n hヾn';
+
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 5e1c83a9c..6859f5fff 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -93,6 +93,10 @@ $labels['flagdeleted'] = 'Deleted';
 $labels['flaganswered'] = 'Answered';
 $labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'Draft';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
index 5aea5dcb8..191291338 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -78,6 +78,16 @@ $labels['flagdeleted'] = 'Deleted';
 $labels['flaganswered'] = 'Answered';
 $labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'Draft';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['varlower'] = 'lower-case';
+$labels['varupper'] = 'upper-case';
+$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varupperfirst'] = 'first character upper-case';
+$labels['varquotewildcard'] = 'quote special characters';
+$labels['varlength'] = 'length';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
new file mode 100644
index 000000000..ea4e982ea
--- /dev/null
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['filters'] = '堈梲晛桯梮掍��';
+$labels['managefilters'] = '埥捸梩捸桴捸��掍晙 桵梲捸��桴楖梐 梮捸桭捸朘梮掍��晛 捰梲晛桯梮掍��旍';
+$labels['filtername'] = '堈梲晛桯晛 捸梮楖��梮';
+$labels['newfilter'] = '��楖�� 捰梲晛桯';
+$labels['filteradd'] = '埜桴掍晙捸��梮掍晙 捰梲晛桯';
+$labels['filterdel'] = '��梮梬掍晙 捰梲晛桯旍';
+$labels['moveup'] = '埴捸��梇��捸��梮掍晙';
+$labels['movedown'] = '堇梬掍��梮掍晙';
+$labels['filterallof'] = '桹掍梲��桮捸晙 掅楖晙楖�� 梣捸桹捸梮梬梮掍��晛梮 桹捸桭捸梣捸梲捸桵晜捸梮楖梐';
+$labels['filteranyof'] = '桹掍梲��桮捸晙 梣捸桹捸梮梬梮掍��晛�� ��捸梮朘捸��捸晢晛梮 桹捸桭捸梣捸梲捸桵晜捸梮楖梐';
+$labels['filterany'] = '掅楖晙楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
+$labels['filtercontains'] = '梣捸��楖��梮捸朘楖��桭 敓';
+$labels['filternotcontains'] = '桯晛 梣捸��楖��梮捸朘楖��桭';
+$labels['filteris'] = '桹捸桴捸桵捸�� 敓';
+$labels['filterisnot'] = '桹捸桴捸桵捸�� 桯敓';
+$labels['filterexists'] = '掁楖桮楖��晥桮楖��梮 楖��梮晛';
+$labels['filternotexists'] = '掁楖桮楖��晥桮楖��梮 桯楖��梮晛';
+$labels['filtermatches'] = '掅捸桴捸��捸��楖��桭 敓 捸��梲捸桹捸桮梲楖��晥桮捸梮旍';
+$labels['filternotmatches'] = '桯晛 掅捸桴捸��捸��楖��桭 捸��梲捸桹捸桮梲楖��晥桮捸梮旍';
+$labels['filterregex'] = '掅捸桴捸��捸��楖��桭 敓 朘捸梮楖梮捸桴楖�� 捸��梲捸桹捸桮梲楖��晥桮捸梮旍';
+$labels['filternotregex'] = '桯晛 掅捸桴捸��捸��楖��桭 朘捸梮楖梮捸桴楖�� 捸��梲捸桹捸桮梲楖��晥桮捸梮旍';
+$labels['filterunder'] = '梲捸朘';
+$labels['filterover'] = '桴��捸';
+$labels['addrule'] = '埜桴掍晙捸��梮掍晙 梣捸桮桭捸梮旍';
+$labels['delrule'] = '��梮梬掍晙 梣捸桮桭捸梮旍';
+$labels['messagemoveto'] = '��掍梐捸��楖晜掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['messageredirect'] = '��掍��捸桹捸桵��掍桴楖��掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['messagecopyto'] = '��捸梲梜掍梮掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['messagesendcopy'] = '����梐捸��朘掍晙 桹捸梐楖��掑捸掁��楖��晥桮捸梮 梣捸梲梜掍梮';
+$labels['messagereply'] = '��捸梲捸桵晜捸梮掍晙 桹捸梐楖��掑捸掁��楖��晥桮捸桭掅';
+$labels['messagedelete'] = '��梮梬掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['messagediscard'] = '��掍梩捸��梮掍晙, 桹捸梐楖��掑捸掁��楖��晥桮捸桭掅';
+$labels['messagesrules'] = '��梲捸��桴楖梐 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 桹捸桭捸��';
+$labels['messagesactions'] = '��耳耿＜諾＞�掍晙 桹掍梲��桮捸晙 掁楖��晢楖梐楖��晥桮楖��梮梮掍��旍.';
+$labels['add'] = '埜桴掍晙捸��梮掍晙';
+$labels['del'] = '��梮梬掍晙';
+$labels['sender'] = '����梐捸��朘楖梐';
+$labels['recipient'] = '��梲捸��楖梐';
+$labels['vacationaddresses'] = '堇桭 桹捸桴掍晙桮捸晙 敓晙��楖桵梲晛 桹捸桵��掍梮掍�� (掅捸晡捸梮桴捸晢 桵梲楖��捸朘掍梲梮掍��楖桴).';
+$labels['vacationdays'] = '堇梮桯 桹捸梜捸晜楖��晥桮捸桭掅 楖��梐捸��朘掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 (����掍��)`';
+$labels['vacationreason'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 掅楖桴捸梮掑捸朘楖��晥桮楖��梮 (捸��梇捸朘楖����掑晛 梣捸梲梜捸梩)`';
+$labels['vacationsubject'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 桴掍��梮捸掁晛��`';
+$labels['rulestop'] = '埭捸掑捸��掍晙 梣捸桮桭捸梮梮掍��晛 桵梲楖��掁楖��桭旍';
+$labels['enable'] = '��晛捸��梮掍晙/埜梮梬捸梲掍晙';
+$labels['filterset'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��';
+$labels['filtersets'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��梮掍��';
+$labels['filtersetadd'] = '埜桴掍晙捸��梮掍晙 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��';
+$labels['filtersetdel'] = '��梮梬掍晙 捸梩朘捸 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��旍';
+$labels['filtersetact'] = '��晛捸��梮掍晙 捸梩朘捸 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��旍';
+$labels['filtersetdeact'] = '埜梮梬捸梲掍晙 捸梩朘捸 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��旍';
+$labels['filterdef'] = '堈梲晛桯晛 桵捸桹桭捸梮楖��桭';
+$labels['filtersetname'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��晛 捸梮楖��梮';
+$labels['newfilterset'] = '��楖�� 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��';
+$labels['active'] = '捸朘梲晛桴';
+$labels['none'] = '楖桯 桭掍朘旍';
+$labels['fromset'] = '桹捸桭捸晙晛��晛��';
+$labels['fromfile'] = '��捸桮晙晛��';
+$labels['filterdisabled'] = '堈梲晛桯旍 捸梮梬捸梲桴捸晢 敓';
+$labels['countisgreaterthan'] = '��捸梮捸朘旍 掁掍��捸捰捸梮��楖��桭 敓';
+$labels['countisgreaterthanequal'] = '��捸梮捸朘旍 掁掍��捸捰捸梮��楖��桭 敓 朘捸桭 桹捸桴捸桵捸�� 敓';
+$labels['countislessthan'] = '��捸梮捸朘旍 梣捸朘捸桵 敓';
+$labels['countislessthanequal'] = '��捸梮捸朘旍 梣捸朘捸桵 敓 朘捸桭 桹捸桴捸桵捸�� 敓';
+$labels['countequals'] = '��捸梮捸朘旍 桹捸桴捸桵捸�� 敓';
+$labels['countnotequals'] = '��捸梮捸朘旍 桹捸桴捸桵捸�� 桯敓';
+$labels['valueisgreaterthan'] = '捸��晡掍��旍 掁掍��捸捰捸梮��楖��桭 敓';
+$labels['valueisgreaterthanequal'] = '捸��晡掍��旍 掁掍��捸捰捸梮��楖��桭 敓 朘捸桭 桹捸桴捸桵捸�� 敓';
+$labels['valueislessthan'] = '捸��晡掍��旍 梣捸朘捸桵 敓';
+$labels['valueislessthanequal'] = '捸��晡掍��旍 梣捸朘捸桵 敓 朘捸桭 桹捸桴捸桵捸�� 敓';
+$labels['valueequals'] = '捸��晡掍��旍 桹捸桴捸桵捸�� 敓';
+$labels['valuenotequals'] = '捸��晡掍��旍 桹捸桴捸桵捸�� 桯敓';
+$labels['setflags'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮旍 梮梫掍晙 楖��梣掍桵';
+$labels['addflags'] = '埜桴掍晙捸��梮掍晙 梮梫捸梮梮掍�� 桹捸梐楖��掑捸掁��楖��晥桮捸梮旍';
+$labels['removeflags'] = '��掍梩捸��梮掍晙 梮梫捸梮梮掍�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮晛��';
+$labels['flagread'] = '堋梮晥掍����桴捸晢';
+$labels['flagdeleted'] = '��梮梬桴捸晢';
+$labels['flaganswered'] = '��捸梲捸桵晜捸梮桴捸晢';
+$labels['flagflagged'] = '��梫桴捸晢';
+$labels['flagdraft'] = '����捸掁晛��';
+$labels['filtercreate'] = '��梲掍梐晢掍晙 捰梲晛桯';
+$labels['usedata'] = '堈梲晛桯楖��桭 ��掁梲捸掁楖��晢掍晙 桹掍梲��桮捸晙 梲掍梐掍朘楖��晥桮楖��梮旍.';
+$labels['nextstep'] = '��捸梬楖��掑 ��捸桮晙';
+$labels['...'] = '���';
+$labels['advancedopts'] = '��捸桴掍晙桮捸晙 旍梮梲��捸梮��梮掍��';
+$labels['body'] = '��捸��桭晛梮';
+$labels['address'] = '桹捸桵��掍';
+$labels['envelope'] = '晢��捸��';
+$labels['modifier'] = '��楖��楖晜晛桯`';
+$labels['text'] = '梲掍��桵梲';
+$labels['undecoded'] = '桭捸��楖����';
+$labels['contenttype'] = '掅楖桴捸梮掑捸朘楖��晥桮捸梮 梲晛梣';
+$labels['modtype'] = '梲晛梣`';
+$labels['allparts'] = '掅楖晙楖��旍';
+$labels['domain'] = '梲晛��楖��桮晥';
+$labels['localpart'] = '晙楖朘捸晙 桭捸桵';
+$labels['user'] = '��掁梲桴楖梐';
+$labels['detail'] = '桭捸桵';
+$labels['comparator'] = '桹捸桭掍桭捸梲晛桯`';
+$labels['default'] = '晙梩捸朘桮捸��';
+$labels['octet'] = '捸梮��楖��楖晜 (��朘梲掍梲)';
+$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
+$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['filterunknownerror'] = '��掍��桴掍��晛 捸梮桹捸桮梲 桵晜捸晙';
+$labels['filterconnerror'] = '��掍��桴掍��晛 桹掍梲 朘捸梣晛 晜梮掑晛����';
+$labels['filterdeleteerror'] = '��掍��桴掍��晛 桵晜捸晙, 捰梲晛桯晛 梬梮梬楖��桭梮 梇捸晜楖梐桴掍����';
+$labels['filterdeleted'] = '堈梲晛桯旍 梬梮梬桴掍����';
+$labels['filtersaved'] = '堈梲晛桯旍 梣捸桹梣捸梮桴掍����';
+$labels['filtersaveerror'] = '��掍��桴掍��晛 桵晜捸晙, 捰梲晛桯晛 梣捸桹梣捸梮桭捸梮 桵晜捸晙��';
+$labels['filterdeleteconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 ��捸梮朘捸梮楖��桭 掍�� 梬梮梬掍晙 梮梫桴捸晢 捰梲晛桯旍��';
+$labels['ruledeleteconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 ��捸梮朘捸梮楖��桭 掍�� 梬梮梬掍晙 梮梫桴捸晢 梣捸桮桭捸梮旍��';
+$labels['actiondeleteconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 ��捸梮朘捸梮楖��桭 掍�� 梬梮梬掍晙 梮梫桴捸晢 掁楖��晢楖梐楖��晥桮楖��梮旍��';
+$labels['forbiddenchars'] = '埭捸梫梲楖��桭 捸梩朘捸 掍梮 捸��掁掍晙桴捸晢 梮晛梫掍����';
+$labels['cannotbeempty'] = '埭捸梫梲旍 掑捸梲捸��朘 桯晛 朘捸��楖梐 晙晛梮掍晙��';
+$labels['ruleexist'] = '����桴捸晢 捸梮楖��梮楖桴 捰梲晛桯 捸��掑掍梮 掁楖桮楖��晥桮楖��梮 楖��梮晛��';
+$labels['setactivateerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��晛 桭晛捸��桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['setdeactivateerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��晛 捸梮梬捸梲桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['setdeleteerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��晛 梬梮梬桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['setactivated'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��旍 桭晛捸��桴捸晢 敓��';
+$labels['setdeactivated'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��旍 捸梮梬捸梲桴捸晢 敓��';
+$labels['setdeleted'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��旍 梬梮梬桴捸晢 敓��';
+$labels['setdeleteconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 ��捸梮朘捸梮楖��桭 掍�� 梬梮梬掍晙 梮梫桴捸晢 捰梲晛桯梮掍��晛 桹捸桭捸晙晛��旍��';
+$labels['setcreateerror'] = '��掍��桴掍��晛 桵晜捸晙�� 堈梲晛桯梮掍��晛 桹捸桭捸晙晛��晛 桵梲掍梐晢楖��桭旍 梇捸晜楖梐桴掍����';
+$labels['setcreated'] = '堈梲晛桯梮掍��晛 桹捸桭捸晙晛��旍 桵梲掍梐晢桴捸晢 敓��';
+$labels['activateerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯晛 桭晛捸��桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['deactivateerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯晛 捸梮梬捸梲桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['activated'] = '堈梲晛桯晛 捸梮梬捸梲桴捸晢 敓��';
+$labels['deactivated'] = '堈梲晛桯晛 桭晛捸��桴捸晢 敓��';
+$labels['moved'] = '堈梲晛桯晛 梲掍梐捸��楖晜桴捸晢 敓��';
+$labels['moveerror'] = '��掍��桴掍��晛 桵晜捸晙�� ��梫桴捸晢 捰梲晛桯晛 梲掍梐捸��楖晜桭捸梮 梇捸晜楖梐楖��桭��';
+$labels['nametoolong'] = '埜梮楖��梮旍 桯捸��捸捰捸梮�� 掍��朘捸�� 敓��';
+$labels['namereserved'] = '埜梮晥楖��桮晙捸梲��掍晙晛 捸梮楖��梮��';
+$labels['setexist'] = '��捸桭捸晙晛��旍 捸��掑掍梮 掁楖桮楖��晥桮楖��梮 楖��梮晛��';
+$labels['nodata'] = '��捸桹捸梮梬桴楖��桭 敓 梮梫掍晙 掁楖梮掍 桭掍朘 掑晛������';
+
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 49675c4c4..f7b96b7d1 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -9,32 +9,31 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
+ | Author: Takahiro Kambe                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['filters'] = '��������怒�踴��';
 $labels['managefilters'] = '���靽∼�∼�潦�怒�柴�������怒�踴�潦��蝞∠��';
-$labels['filtername'] = '��������怒�踴�潦�桀�����';
+$labels['filtername'] = '��������怒�踴�澆��';
 $labels['newfilter'] = '��啜�������������怒�踴��';
 $labels['filteradd'] = '��������怒�踴�潦��餈賢��';
 $labels['filterdel'] = '��������怒�踴�潦��������';
 $labels['moveup'] = '銝���怎宏���';
 $labels['movedown'] = '銝���怎宏���';
-$labels['filterallof'] = '甈∼�柴�怒�潦�怒����嫘�艾�思�����';
-$labels['filteranyof'] = '甈∼�柴�怒�潦�怒�柴�押�������思�����';
+$labels['filterallof'] = '甈∼�柴�怒�潦�怒�柴����嫘�艾�思�����';
+$labels['filteranyof'] = '甈∼�柴�怒�潦�怒�柴�������������思�����';
 $labels['filterany'] = '�����嫘�艾�柴�∼����颯�潦��';
 $labels['filtercontains'] = '��怒��';
 $labels['filternotcontains'] = '��怒�整�芥��';
-$labels['filteris'] = '甈∼�函��������';
-$labels['filterisnot'] = '甈∼�函����������芥��';
+$labels['filteris'] = '甈∼�怎��������';
+$labels['filterisnot'] = '甈∼�怎����������芥��';
 $labels['filterexists'] = '���摮����';
 $labels['filternotexists'] = '���摮���具����芥��';
-$labels['filtermatches'] = '甈∼�桀����其�����';
-$labels['filternotmatches'] = '甈∼�桀����其����氬����芥��';
-$labels['filterregex'] = '甈∼�格迤閬�銵函�整�其�����';
+$labels['filtermatches'] = '甈∼�桀����思�����';
+$labels['filternotmatches'] = '甈∼�桀����思����氬����芥��';
+$labels['filterregex'] = '甈∼�格迤閬�銵函�整�思�����';
 $labels['filternotregex'] = '甈∼�格迤閬�銵函�整�思����氬����芥��';
 $labels['filterunder'] = '������銝�';
 $labels['filterover'] = '������銝�';
@@ -48,7 +47,7 @@ $labels['messagereply'] = '��∼����颯�潦�詻��餈�靽�';
 $labels['messagedelete'] = '��∼����颯�潦�詻��������';
 $labels['messagediscard'] = '��∼����颯�潦�詻����湔��';
 $labels['messagesrules'] = '���靽∼�������∼�潦�怒�桀�衣��:';
-$labels['messagesactions'] = '隞乩����桀��雿����摰�銵�:';
+$labels['messagesactions'] = '隞乩����格��雿����摰�銵�:';
 $labels['add'] = '餈賢��';
 $labels['del'] = '������';
 $labels['sender'] = '���靽∟��';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
new file mode 100644
index 000000000..c3fff4115
--- /dev/null
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -0,0 +1,131 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['filters'] = '������';
+$labels['managefilters'] = '������ 諰���� ������ 窵�謔�';
+$labels['filtername'] = '������ ��渠��';
+$labels['newfilter'] = '��� ������';
+$labels['filteradd'] = '������ 黺�穈�';
+$labels['filterdel'] = '������ ��原��';
+$labels['moveup'] = '���諢� ��渠��';
+$labels['movedown'] = '������諢� ��渠��';
+$labels['filterallof'] = '��木����� ��月�� 篞�儦���� ���賱���� ��潰��';
+$labels['filteranyof'] = '��木����� ��月�� 篞�儦���� 鴗� ��渠����� 窶� ��渠�潺�� ��潰��';
+$labels['filterany'] = '諈刺�� 諰����鴔�';
+$labels['filtercontains'] = '��秒�刮�拘�����';
+$labels['filternotcontains'] = '��秒�刮��鴔� �����蛟�����';
+$labels['filteris'] = '��� 穈���蛟�����';
+$labels['filterisnot'] = '��� 穈�鴔� �����蛟�����';
+$labels['filterexists'] = '魽渥�秒�拘�����';
+$labels['filternotexists'] = '魽渥�秒��鴔� �����蛟�����';
+$labels['filtermatches'] = '���������窸� ��潰����拘�����';
+$labels['filternotmatches'] = '���������窸� ��潰�����鴔� �����蛟�����';
+$labels['filterregex'] = '���篞����������窸� ��潰����拘�����';
+$labels['filternotregex'] = '���篞� ���������窸� ��潰�����鴔� �����蛟�����';
+$labels['addrule'] = '篞�儦� ������篣�';
+$labels['delrule'] = '篞�儦� ��原��';
+$labels['messagemoveto'] = '諰����鴔� ��渠��';
+$labels['messageredirect'] = '諰����鴔�諝� Redirect';
+$labels['messagecopyto'] = '諰����鴔�諝� 貐蛙��';
+$labels['messagesendcopy'] = '諰����鴔���� 貐蛙�禺雩 貐渠�湊萼';
+$labels['messagereply'] = '諰����鴔���� ���������篣�';
+$labels['messagedelete'] = '諰����鴔� ��原��';
+$labels['add'] = '黺�穈�';
+$labels['del'] = '��原��';
+$labels['sender'] = '貐渠�� ��禺��';
+$labels['recipient'] = '���������';
+$labels['vacationaddresses'] = '������ 黺�穈� e-mail 鴥潰��(���) (儠月��諢� 窱禺�� ���):';
+$labels['vacationreason'] = '諰����鴔� 貐賈爰 (��湊�� ��科��):';
+$labels['vacationsubject'] = '諰����鴔� ���諈�:';
+$labels['rulestop'] = '篞�儦���� ��欠����� 諰�黺�';
+$labels['enable'] = '��科��/��科�拖�����';
+$labels['filterset'] = '������ 諡塑��';
+$labels['filtersets'] = '������ 諡塑��';
+$labels['filtersetadd'] = '������ 諡塑�� 黺�穈�';
+$labels['filtersetdel'] = '������ ������ 諡塑����� ��原��';
+$labels['filtersetact'] = '������ ������ ��貲�賈未 �����桶��';
+$labels['filtersetdeact'] = '������ ������ ��貲�賈未 赬������桶��';
+$labels['filterdef'] = '������ ������';
+$labels['filtersetname'] = '������ ��貲�� ��渠��';
+$labels['newfilterset'] = '���諢���� ������ ��貲��';
+$labels['active'] = '������';
+$labels['none'] = '������';
+$labels['fromset'] = '諡塑����潺�� 賱����';
+$labels['fromfile'] = '�����潺�� 賱����';
+$labels['filterdisabled'] = '������ ��科�拗��鴔� ������';
+$labels['countisgreaterthan'] = '穈芻��穈� ���';
+$labels['countisgreaterthanequal'] = '穈芻��穈� ��禹掠��� 穈����';
+$labels['countislessthan'] = '穈芻��穈� ������';
+$labels['countislessthanequal'] = '穈芻��穈� ���穇圉�� 穈����';
+$labels['countequals'] = '穈芻��穈� 穈����';
+$labels['countnotequals'] = '穈芻��穈� 穈�鴔� ������';
+$labels['valueisgreaterthan'] = '穈���� ���';
+$labels['valueisgreaterthanequal'] = '穈���� ��禹掠��� 穈����';
+$labels['valueislessthan'] = '穈���� ������';
+$labels['valueislessthanequal'] = '穈���� ���穇圉�� 穈����';
+$labels['valueequals'] = '穈���� 穈����';
+$labels['valuenotequals'] = '穈���� 穈�鴔� ������';
+$labels['setflags'] = '諰����鴔���� ������篞賈未 ��木��';
+$labels['addflags'] = '諰����鴔���� ������篞賈未 黺�穈�';
+$labels['removeflags'] = '諰����鴔������� ������篞賈未 ���穇�';
+$labels['flagread'] = '��趣��';
+$labels['flagdeleted'] = '��原�����';
+$labels['flaganswered'] = '�����蛭��';
+$labels['flagflagged'] = '���������';
+$labels['flagdraft'] = '������ 貐湊�����';
+$labels['filtercreate'] = '������ ������';
+$labels['usedata'] = '�����域����� ��木����� ��月�� ��域�渣�圉未 ��科��';
+$labels['nextstep'] = '��木�� ��刷��';
+$labels['...'] = '...';
+$labels['advancedopts'] = '������ ��木��';
+$labels['body'] = '貐賈爰';
+$labels['address'] = '鴥潰��';
+$labels['text'] = '�����欠��';
+$labels['domain'] = '���諰����';
+$labels['user'] = '��科�拖��';
+$labels['default'] = '篣圉雩穈�';
+$labels['filterunknownerror'] = '������ ������ ���貒� ������.';
+$labels['filterconnerror'] = '���貒���� ��國盒��� ��� �����蛟�����.';
+$labels['filterdeleteerror'] = '�����圉未 ��原����� ��� �����蛟�����. ���貒� ������ 諻���� ���.';
+$labels['filterdeleted'] = '�����圉未 ��梓陬�����潺�� ��原�� ���.';
+$labels['filtersaved'] = '�����圉未 ��梓陬�����潺�� ������ ���.';
+$labels['filtersaveerror'] = '�����圉未 �����伕�� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['filterdeleteconfirm'] = '���諤�諢� ��������� �����域�� ��原��諝� ��������卿��篧�?';
+$labels['ruledeleteconfirm'] = '��������� 篞�儦���� ��原�����窸���� ������ 窶���� �����欠�拘��篧�?';
+$labels['actiondeleteconfirm'] = '��������� ��������� ��原�����窸���� ������ 窶���� �����欠�拘��篧�?';
+$labels['forbiddenchars'] = '��������� 篣�鴔���� 諡賄��穈� ������.';
+$labels['cannotbeempty'] = '��������� 赬���渥����� ��� ������.';
+$labels['ruleexist'] = '鴔������� ��渠����� �����國�� ��渠站 魽渥�� ���.';
+$labels['setactivateerror'] = '��������� ������ 諡塑����� �����桶�� ��� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['setdeactivateerror'] = '��������� ������ 諡塑����� 赬������桶�� ��� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['setdeleteerror'] = '��������� ������ 諡塑����� ��原����� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['setactivated'] = '������ 諡塑����� ��梓陬�����潺�� �����桶�� ���������.';
+$labels['setdeactivated'] = '������ 諡塑����� ��梓陬�����潺�� 赬������桶�� ���������.';
+$labels['setdeleted'] = '������ 諡塑����� ��梓陬�����潺�� ��原�� ���.';
+$labels['setdeleteconfirm'] = '��������� ������ 諡塑����� 鴔���國����� ������ 窶���� �����欠�拘��篧�?';
+$labels['setcreateerror'] = '������ 諡塑����� �����桶�� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['setcreated'] = '������ 諡塑����� ��梓陬�����潺�� ������ ���.';
+$labels['activateerror'] = '��������� ������(���)��� ���������窶� ��� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['deactivateerror'] = '��������� ������(���)��� ���������鴔� ���窶� ��� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['activated'] = '������(���)��� ���������鴔� ���窶� ��������� ��梓陬���������.';
+$labels['deactivated'] = '������(���)��� ���������窶� ��������� ��梓陬���������.';
+$labels['moved'] = '�����圉未 ��渠�������� ��� ��梓陬���������.';
+$labels['moveerror'] = '��������� �����圉未 ��渠����� ��� ������. ���貒� ������ 諻���� ���.';
+$labels['nametoolong'] = '��渠����� ���諡� 篧�.';
+$labels['namereserved'] = '�����趟�� ��渠��.';
+$labels['setexist'] = '諡塑����� ��渠站 魽渥�� ���.';
+$labels['nodata'] = '�����渠�� ��������� ���儦�穈� �����������渥�� ���!';
+
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index a4a1aeae6..0b4cb6073 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -93,6 +93,16 @@ $labels['flagdeleted'] = 'Usuni��ta';
 $labels['flaganswered'] = 'Z odpowiedzi��';
 $labels['flagflagged'] = 'Oflagowana';
 $labels['flagdraft'] = 'Szkic';
+$labels['setvariable'] = 'Ustaw zmienn��';
+$labels['setvarname'] = 'Nazwa zmiennej:';
+$labels['setvarvalue'] = 'Warto���� zmiennej:';
+$labels['setvarmodifiers'] = 'Modyfikatory:';
+$labels['varlower'] = 'ma��e litery (:lower)';
+$labels['varupper'] = 'du髒e litery (:upper)';
+$labels['varlowerfirst'] = 'pierwsza litera ma��a (:lowerfirst)';
+$labels['varupperfirst'] = 'pierwsza litera du髒a (:upperfirst)';
+$labels['varquotewildcard'] = 'anulowane znaki specjalne (:quotewildcard)';
+$labels['varlength'] = 'd��ugo���� (:length)';
 $labels['filtercreate'] = 'Utw籀rz filtr';
 $labels['usedata'] = 'U髒yj nast��puj��cych danych do utworzenia filtra:';
 $labels['nextstep'] = 'Nast��pny krok';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 79c55912e..cfc2ac1e4 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vyacheslav Sharmanov <Unknown>                                |
+ | Author: Vyacheslav Sharmanov                                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -36,8 +35,8 @@ $labels['filtermatches'] = '��郋赲郈訄迡訄迮�� �� 赲����訄迠迮郇邽迮邾';
 $labels['filternotmatches'] = '郇迮 ��郋赲郈訄迡訄迮�� �� 赲����訄迠迮郇邽迮邾';
 $labels['filterregex'] = '��郋赲郈訄迡訄迮�� �� ��迮迣��郅����郇��邾 赲����訄迠迮郇邽迮邾';
 $labels['filternotregex'] = '郇迮 ��郋赲郈訄迡訄迮�� �� ��迮迣��郅����郇��邾 赲����訄迠迮郇邽迮邾';
-$labels['filterunder'] = '郈郋迡';
-$labels['filterover'] = '郇訄';
+$labels['filterunder'] = '邾迮郇����迮';
+$labels['filterover'] = '訇郋郅����迮';
 $labels['addrule'] = '��郋訇訄赲邽���� 郈��訄赲邽郅郋';
 $labels['delrule'] = '苺迡訄郅邽���� 郈��訄赲邽郅郋';
 $labels['messagemoveto'] = '��迮��迮邾迮����邽���� ��郋郋訇��迮郇邽迮 赲';
@@ -53,7 +52,7 @@ $labels['add'] = '��郋訇訄赲邽����';
 $labels['del'] = '苺迡訄郅邽����';
 $labels['sender'] = '����郈��訄赲邽��迮郅��';
 $labels['recipient'] = '��郋郅����訄��迮郅��';
-$labels['vacationaddresses'] = '苤郈邽��郋郕 迡郋郈郋郅郇邽��迮郅��郇���� 訄迡��迮��郋赲 郈郋郅����訄��迮郅�� (��訄郱迡迮郅��郇郇���� 郱訄郈������邾邽):';
+$labels['vacationaddresses'] = '苤郈邽��郋郕 邾郋邽�� 迡郋郈郋郅郇邽��迮郅��郇���� 訄迡��迮��郋赲 (��訄郱迡迮郅��郇郇���� 郱訄郈������邾邽):';
 $labels['vacationdays'] = '��訄郕 ��訄����郋 郋��郈��訄赲郅������ ��郋郋訇��迮郇邽�� (赲 迡郇����):';
 $labels['vacationreason'] = '苠迮郕���� ��郋郋訇��迮郇邽�� (郈��邽��邽郇訄 郋������������赲邽��):';
 $labels['vacationsubject'] = '苠迮邾訄 ��郋郋訇��迮郇邽��:';
@@ -69,7 +68,7 @@ $labels['filterdef'] = '��郈邽��訄郇邽迮 ��邽郅������訄';
 $labels['filtersetname'] = '��訄郱赲訄郇邽迮 郇訄訇郋��訄 ��邽郅������郋赲';
 $labels['newfilterset'] = '��郋赲��邿 郇訄訇郋�� ��邽郅������郋赲';
 $labels['active'] = '邽��郈郋郅��郱��迮������';
-$labels['none'] = '郈������郋邿';
+$labels['none'] = '郇迮��';
 $labels['fromset'] = '邽郱 郇訄訇郋��訄';
 $labels['fromfile'] = '邽郱 ��訄邿郅訄';
 $labels['filterdisabled'] = '����郕郅����邽���� ��邽郅������';
@@ -85,8 +84,8 @@ $labels['valueislessthan'] = '郱郇訄��迮郇邽迮 邾迮郇����迮, ��迮邾';
 $labels['valueislessthanequal'] = '郱郇訄��迮郇邽迮 邾迮郇����迮 邽郅邽 ��訄赲郇郋';
 $labels['valueequals'] = '郱郇訄��迮郇邽迮 ��訄赲郇郋';
 $labels['valuenotequals'] = '郱郇訄��迮郇邽迮 郇迮 ��訄赲郇郋';
-$labels['setflags'] = '苺����訄郇郋赲邽���� ��郅訄迣 郇訄 ��郋郋訇��迮郇邽迮';
-$labels['addflags'] = '��郋訇訄赲邽���� ��郅訄迣 郕 ��郋郋訇��迮郇邽��';
+$labels['setflags'] = '苺����訄郇郋赲邽���� ��郅訄迣邽 郇訄 ��郋郋訇��迮郇邽迮';
+$labels['addflags'] = '��郋訇訄赲邽���� ��郅訄迣邽 郕 ��郋郋訇��迮郇邽��';
 $labels['removeflags'] = '苺訇��訄���� ��郅訄迣邽 邽郱 ��郋郋訇��迮郇邽��';
 $labels['flagread'] = '����郋��邽��訄郇郋';
 $labels['flagdeleted'] = '苺迡訄郅迮郇郋';
@@ -101,43 +100,49 @@ $labels['advancedopts'] = '��郋郈郋郅郇邽��迮郅��郇��迮 郈訄��訄邾迮������';
 $labels['body'] = '苠迮郅郋 郈邽����邾訄';
 $labels['address'] = '訄迡��迮��';
 $labels['envelope'] = '郕郋郇赲迮����';
-$labels['modifier'] = '邾郋迡邽��邽郕訄��郋��:';
+$labels['modifier'] = '邾郋迡邽��邽郕訄��郋�� 郋訇郅訄����邽 郈郋邽��郕訄:';
 $labels['text'] = '��迮郕����';
+$labels['undecoded'] = '郇迮郋訇��訄訇郋��訄郇郇��邿 (������郋邿)';
 $labels['contenttype'] = '��邽郈 ��郋迡迮��迠邽邾郋迣郋';
-$labels['modtype'] = '��邽郈:';
-$labels['allparts'] = '赲��迮';
-$labels['domain'] = '迡郋邾迮郇';
-$labels['localpart'] = '郅郋郕訄郅��郇訄�� ��訄������';
-$labels['user'] = '郈郋郅��郱郋赲訄��迮郅��';
-$labels['detail'] = '迡迮��訄郅邽';
+$labels['modtype'] = '郈郋邽��郕 赲 訄迡��迮��訄��:';
+$labels['allparts'] = '赲迮郱迡迮';
+$labels['domain'] = '赲 邽邾迮郇邽 迡郋邾迮郇訄';
+$labels['localpart'] = '��郋郅��郕郋 赲 邽邾迮郇邽 郈郋郅��郱郋赲訄��迮郅��, 訇迮郱 迡郋邾迮郇訄';
+$labels['user'] = '赲 郈郋郅郇郋邾 邽邾迮郇邽 郈郋郅��郱郋赲訄��迮郅��';
+$labels['detail'] = '赲 迡郋郈郋郅郇邽��迮郅��郇���� ��赲迮迡迮郇邽����';
+$labels['comparator'] = '��郈郋��郋訇 ����訄赲郇迮郇邽��:';
 $labels['default'] = '郈郋 ��邾郋郅��訄郇邽��';
+$labels['octet'] = '苤����郋迣邽邿 (octet)';
+$labels['asciicasemap'] = '��迮迣邽������郋郇迮郱訄赲邽��邽邾��邿 (ascii-casemap)';
+$labels['asciinumeric'] = '虴邽��郅郋赲郋邿 (ascii-numeric)';
 $labels['filterunknownerror'] = '��迮邽郱赲迮����郇訄�� 郋��邽訇郕訄 ��迮��赲迮��訄';
 $labels['filterconnerror'] = '��迮赲郋郱邾郋迠郇郋 郈郋迡��郋迮迡邽郇邽������ 郕 ��迮��赲迮���� ��邽郅������郋赲';
-$labels['filterdeleteerror'] = '��迮赲郋郱邾郋迠郇郋 ��迡訄郅邽���� ��邽郅������. ����邽訇郕訄 ��迮��赲迮��訄';
-$labels['filterdeleted'] = '苳邽郅������ ����郈迮��郇郋 ��迡訄郅��郇';
-$labels['filtersaved'] = '苳邽郅������ ����郈迮��郇郋 ��郋����訄郇��郇';
-$labels['filtersaveerror'] = '��迮赲郋郱邾郋迠郇郋 ��郋����訄郇邽���� ��邽郅������. ����邽訇郕訄 ��迮��赲迮��訄';
+$labels['filterdeleteerror'] = '��迮赲郋郱邾郋迠郇郋 ��迡訄郅邽���� ��邽郅������. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['filterdeleted'] = '苳邽郅������ ����郈迮��郇郋 ��迡訄郅��郇.';
+$labels['filtersaved'] = '苳邽郅������ ����郈迮��郇郋 ��郋����訄郇��郇.';
+$labels['filtersaveerror'] = '��迮赲郋郱邾郋迠郇郋 ��郋����訄郇邽���� ��邽郅������. ����邽訇郕訄 ��迮��赲迮��訄.';
 $labels['filterdeleteconfirm'] = '���� 迡迮邿����赲邽��迮郅��郇郋 ��郋��邽��迮 ��迡訄郅邽���� ��邽郅������?';
 $labels['ruledeleteconfirm'] = '���� ��赲迮��迮郇郇��, ����郋 ��郋��邽��迮 ��迡訄郅邽���� ����郋 郈��訄赲邽郅郋?';
 $labels['actiondeleteconfirm'] = '���� ��赲迮��迮郇郇��, ����郋 ��郋��邽��迮 ��迡訄郅邽���� ����郋 迡迮邿����赲邽迮?';
-$labels['forbiddenchars'] = '��迮迡郋郈������邽邾��迮 ��邽邾赲郋郅�� 赲 郈郋郅迮';
-$labels['cannotbeempty'] = '��郋郅迮 郇迮 邾郋迠迮�� 訇������ 郈��������邾';
+$labels['forbiddenchars'] = '��迮迡郋郈������邽邾��迮 ��邽邾赲郋郅�� 赲 郈郋郅迮.';
+$labels['cannotbeempty'] = '��郋郅迮 郇迮 邾郋迠迮�� 訇������ 郈��������邾.';
 $labels['ruleexist'] = '苳邽郅������ �� ��訄郕邽邾 邽邾迮郇迮邾 ��迠迮 ������迮����赲��迮��.';
-$labels['setactivateerror'] = '��迮赲郋郱邾郋迠郇郋 赲郕郅����邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄';
-$labels['setdeactivateerror'] = '��迮赲郋郱邾郋迠郇郋 郋��郕郅����邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄';
-$labels['setdeleteerror'] = '��迮赲郋郱邾郋迠郇郋 ��迡訄郅邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄';
-$labels['setactivated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 赲郕郅������郇';
-$labels['setdeactivated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 郋��郕郅������郇';
-$labels['setdeleted'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 ��迡訄郅��郇';
+$labels['setactivateerror'] = '��迮赲郋郱邾郋迠郇郋 赲郕郅����邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['setdeactivateerror'] = '��迮赲郋郱邾郋迠郇郋 郋��郕郅����邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['setdeleteerror'] = '��迮赲郋郱邾郋迠郇郋 ��迡訄郅邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['setactivated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 赲郕郅������郇.';
+$labels['setdeactivated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 郋��郕郅������郇.';
+$labels['setdeleted'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 ��迡訄郅��郇.';
 $labels['setdeleteconfirm'] = '���� ��赲迮��迮郇�� 赲 ��郋邾, ����郋 ��郋��邽��迮 ��迡訄郅邽���� 赲��訇��訄郇郇��邿 郇訄訇郋�� ��邽郅������郋赲?';
-$labels['setcreateerror'] = '��迮赲郋郱邾郋迠郇郋 ��郋郱迡訄���� 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄';
-$labels['setcreated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 ��郋郱迡訄郇';
+$labels['setcreateerror'] = '��迮赲郋郱邾郋迠郇郋 ��郋郱迡訄���� 郇訄訇郋�� ��邽郅������郋赲. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['setcreated'] = '��訄訇郋�� ��邽郅������郋赲 ����郈迮��郇郋 ��郋郱迡訄郇.';
 $labels['activateerror'] = '��迮赲郋郱邾郋迠郇郋 赲郕郅����邽���� 赲��訇��訄郇郇��邿(迮) ��邽郅������(��). ����邽訇郕訄 ��迮��赲迮��訄.';
 $labels['deactivateerror'] = '��迮赲郋郱邾郋迠郇郋 赲��郕郅����邽���� 赲��訇��訄郇郇��邿(迮) ��邽郅������(��). ����邽訇郕訄 ��迮��赲迮��訄.';
 $labels['activated'] = '苳邽郅������(��) ����郈迮��郇郋 郋��郕郅����迮郇(��).';
 $labels['deactivated'] = '苳邽郅������(��) ����郈迮��郇郋 赲郕郅����迮郇(��).';
 $labels['moved'] = '苳邽郅������ ����郈迮��郇郋 郈迮��迮邾迮����郇.';
-$labels['nametoolong'] = '��迮赲郋郱邾郋迠郇郋 ��郋郱迡訄���� 郇訄訇郋�� ��邽郅������郋赲. ��訄郱赲訄郇邽迮 ��郅邽��郕郋邾 迡郅邽郇郇郋迮';
+$labels['moveerror'] = '��迮赲郋郱邾郋迠郇郋 郈迮��迮邾迮����邽���� ��邽郅������. ����邽訇郕訄 ��迮��赲迮��訄.';
+$labels['nametoolong'] = '��迮赲郋郱邾郋迠郇郋 ��郋郱迡訄���� 郇訄訇郋�� ��邽郅������郋赲. ��訄郱赲訄郇邽迮 ��郅邽��郕郋邾 迡郅邽郇郇郋迮.';
 $labels['namereserved'] = '��訄��迮郱迮��赲邽��郋赲訄郇郇郋迮 邽邾��.';
 $labels['setexist'] = '��訄訇郋�� ��迠迮 ������迮����赲��迮��.';
 $labels['nodata'] = '����迠郇郋 赲��訇��訄���� ��郋���� 訇�� 郋迡郇�� 郈郋郱邽��邽��!';
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index fd3690f18..a0b61e70e 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -9,18 +9,17 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
+ | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['filters'] = 'Pravila';
-$labels['managefilters'] = 'Uredi sporo��ilna pravila';
-$labels['filtername'] = 'Ime pravila';
-$labels['newfilter'] = 'Novo pravilo';
-$labels['filteradd'] = 'Dodaj pravilo';
-$labels['filterdel'] = 'Izbri禳i pravilo';
+$labels['filters'] = 'Filtri';
+$labels['managefilters'] = 'Uredi filtre za dohodno po禳to';
+$labels['filtername'] = 'Ime filtra';
+$labels['newfilter'] = 'Nov filter';
+$labels['filteradd'] = 'Dodaj filter';
+$labels['filterdel'] = 'Izbri禳i filter';
 $labels['moveup'] = 'Pomakni se navzgor';
 $labels['movedown'] = 'Pomakni se navzdol';
 $labels['filterallof'] = 'izpolnjeni morajo biti vsi pogoji';
@@ -101,14 +100,19 @@ $labels['advancedopts'] = 'Dodatne mo鱉nosti';
 $labels['body'] = 'Vsebina';
 $labels['address'] = 'naslov';
 $labels['envelope'] = 'ovojnica';
+$labels['modifier'] = 'modifikator';
 $labels['text'] = 'besedilo';
+$labels['undecoded'] = 'neobdelano';
 $labels['contenttype'] = 'tip vsebine';
 $labels['modtype'] = 'tip';
 $labels['allparts'] = 'vse';
 $labels['domain'] = 'domena';
+$labels['localpart'] = 'lokalni del';
 $labels['user'] = 'uporabnik';
 $labels['detail'] = 'podrobnosti';
+$labels['comparator'] = 'primerjalnik';
 $labels['default'] = 'privzeto';
+$labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'ni ob��utljiv na velike/male ��rke (ascii-casemap)';
 $labels['asciinumeric'] = 'numeri��no (ascii-numeric)';
 $labels['filterunknownerror'] = 'Pri禳lo je do neznane napake.';
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index cacece8c7..31bdc1ecd 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -137,6 +136,8 @@ $labels['setdeleted'] = '餈�皛文�冽����������扎��';
 $labels['setdeleteconfirm'] = '雿�蝖桀��閬������斗��摰�餈�皛文�剁��';
 $labels['setcreateerror'] = '���瘜����撱箄��皛文�剁�������∪�券��霂胯��';
 $labels['setcreated'] = '餈�皛文�冽��������撱箝��';
+$labels['activateerror'] = '���瘜���舐�券��銝剔��餈�皛文�剁�����銝箸����∪�典��������霂胯��';
+$labels['deactivateerror'] = '���瘜�蝳���券��銝剔��餈�皛文�剁�����銝箸����∪�典��������霂胯��';
 $labels['activated'] = '蝳���刻��皛文�冽��������';
 $labels['deactivated'] = '��舐�刻��皛文�冽��������';
 $labels['moved'] = '餈�皛文�函宏��冽��������';
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index 10a547ad7..db2292b9a 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen <Unknown>                                              |
+ | Author: Nansen                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -125,5 +124,11 @@ $labels['setdeleted'] = '蝭拚�詨�券�������������芷��';
 $labels['setdeleteconfirm'] = '雿�蝣箏��閬���芷�日�豢�����蝭拚�詨�券��������嚗�';
 $labels['setcreateerror'] = '��⊥��撱箇��蝭拚�詨�券�������� 隡箸����函�潛����航炊';
 $labels['setcreated'] = '蝭拚�詨�券�����������撱箇��';
+$labels['activateerror'] = '��⊥�������券�豢�����蝭拚�詨�具��隡箸����券�航炊';
+$labels['deactivateerror'] = '��⊥�������券�豢�����蝭拚�詨�具��隡箸����券�航炊';
+$labels['activated'] = '蝭拚�詨�典歇������';
+$labels['deactivated'] = '蝭拚�詨�典歇������';
+$labels['moved'] = '蝭拚�詨�典歇蝘餃��';
+$labels['moveerror'] = '��⊥��蝘餃����豢�����蝭拚�詨�具��隡箸����券�航炊';
 $labels['nametoolong'] = '��⊥��撱箇��蝭拚�詨�券�������� ���蝔勗云���';
 
diff --git a/plugins/markasjunk/localization/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc
index 6fd1c3f3f..c353b2e1c 100644
--- a/plugins/markasjunk/localization/cs_CZ.inc
+++ b/plugins/markasjunk/localization/cs_CZ.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Tom獺禳 Kyzlink                                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Ozna��it jako Spam';
 $labels['reportedasjunk'] = '��sp��禳n�� nahl獺禳eno jako Spam';
 
diff --git a/plugins/markasjunk/localization/da_DK.inc b/plugins/markasjunk/localization/da_DK.inc
index db1baf220..e50016e5f 100644
--- a/plugins/markasjunk/localization/da_DK.inc
+++ b/plugins/markasjunk/localization/da_DK.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Johannes Hessellund <osos@openeyes.dk>                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marker som spam mail';
 $labels['reportedasjunk'] = 'Successfuldt rapporteret som spam mail';
 
diff --git a/plugins/markasjunk/localization/de_CH.inc b/plugins/markasjunk/localization/de_CH.inc
index 0268b5454..89285709e 100644
--- a/plugins/markasjunk/localization/de_CH.inc
+++ b/plugins/markasjunk/localization/de_CH.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
 
diff --git a/plugins/markasjunk/localization/de_DE.inc b/plugins/markasjunk/localization/de_DE.inc
index 311b317f6..2455911fa 100644
--- a/plugins/markasjunk/localization/de_DE.inc
+++ b/plugins/markasjunk/localization/de_DE.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
 
diff --git a/plugins/markasjunk/localization/es_ES.inc b/plugins/markasjunk/localization/es_ES.inc
index 91557a19d..d018513ce 100644
--- a/plugins/markasjunk/localization/es_ES.inc
+++ b/plugins/markasjunk/localization/es_ES.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: pompilos <ciordia@gmail.com>                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'SPAM';
 $labels['buttontitle'] = 'Marcar como SPAM';
 $labels['reportedasjunk'] = 'Mensaje informado como SPAM';
 
diff --git a/plugins/markasjunk/localization/hy_AM.inc b/plugins/markasjunk/localization/hy_AM.inc
new file mode 100644
index 000000000..b30707ef0
--- /dev/null
+++ b/plugins/markasjunk/localization/hy_AM.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = '埳捸��楖梮';
+$labels['buttontitle'] = '��梫掍晙 楖��梣掍桵 埳捸��楖梮';
+$labels['reportedasjunk'] = '埴捸��掍桹捸梬楖梐 桹捸梐楖��掑桴掍�� 楖��梣掍桵 埳捸��楖梮';
+
diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc
index d4fbaea41..fa17bd095 100644
--- a/plugins/markasjunk/localization/ja_JP.inc
+++ b/plugins/markasjunk/localization/ja_JP.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
+ | Author: Takahiro Kambe                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '餈瑟����∼�潦��';
 $labels['buttontitle'] = '餈瑟����∼�潦�怒�具����西身摰�';
 $labels['reportedasjunk'] = '餈瑟����∼�潦�怒�具����血�勗�������整��������';
 
diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc
new file mode 100644
index 000000000..bfc38d1d5
--- /dev/null
+++ b/plugins/markasjunk/localization/ko_KR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = '�����禺�����';
+$labels['buttontitle'] = '�����禺����潺�� ������';
+$labels['reportedasjunk'] = '��梓陬�����潺��, �����禺����潰�渠�� 貐湊�� ���';
+
diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc
index cb6453458..cd3520ec7 100644
--- a/plugins/markasjunk/localization/pl_PL.inc
+++ b/plugins/markasjunk/localization/pl_PL.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Oznacz jako SPAM';
 $labels['reportedasjunk'] = 'Pomy��lnie oznaczono jako SPAM';
 
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
index d3547632a..acac7e180 100644
--- a/plugins/markasjunk/localization/ru_RU.inc
+++ b/plugins/markasjunk/localization/ru_RU.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '苤������';
 $labels['buttontitle'] = '��迮��迮邾迮����邽���� 赲 "苤������';
 $labels['reportedasjunk'] = '��迮��迮邾迮��迮郇郋 赲 "苤������';
 
diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc
index e0827cdfd..ee208347d 100644
--- a/plugins/markasjunk/localization/sk_SK.inc
+++ b/plugins/markasjunk/localization/sk_SK.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: panda                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Ozna��i聽 ako Spam';
 $labels['reportedasjunk'] = '��spe禳ne nahl獺sen矇 ako Spam';
 
diff --git a/plugins/markasjunk/localization/sr_CS.inc b/plugins/markasjunk/localization/sr_CS.inc
new file mode 100644
index 000000000..aa26dddc7
--- /dev/null
+++ b/plugins/markasjunk/localization/sr_CS.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = '苤邾迮��迮';
+$labels['buttontitle'] = '��郱郇訄��邽 郕訄郋 c邾迮��迮';
+$labels['reportedasjunk'] = '苺��郈迮��郇郋 郈��邽��訄赲��迮郇邽 郕訄郋 c邾迮��迮';
+
diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc
index e9343169e..4ff14bec9 100644
--- a/plugins/markasjunk/localization/sv_SE.inc
+++ b/plugins/markasjunk/localization/sv_SE.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jonas Nasholm                                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Skr瓣p';
 $labels['buttontitle'] = 'M瓣rk som skr瓣p';
 $labels['reportedasjunk'] = 'Framg疇ngsrikt rapporterat som skr瓣p';
 
diff --git a/plugins/markasjunk/localization/zh_TW.inc b/plugins/markasjunk/localization/zh_TW.inc
index aa00559b1..372d8d6c5 100644
--- a/plugins/markasjunk/localization/zh_TW.inc
+++ b/plugins/markasjunk/localization/zh_TW.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Nansen                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '�����暸�萎辣';
 $labels['buttontitle'] = '璅�蝷箇�箏����曆縑';
 $labels['reportedasjunk'] = '�����������勗����曆縑';
 
diff --git a/plugins/new_user_dialog/localization/hy_AM.inc b/plugins/new_user_dialog/localization/hy_AM.inc
new file mode 100644
index 000000000..46c7c0853
--- /dev/null
+++ b/plugins/new_user_dialog/localization/hy_AM.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['identitydialogtitle'] = '埮��捸����掍�� ��掍�� 晛梮��梮楖��晥桮楖��梮旍';
+$labels['identitydialoghint'] = '埜桮桵 梮梫楖��桭旍 掍����楖��桭 敓 桭晛捸桮梮 捸梩捸梬晛梮 桭楖��梲��晛 晡捸桭捸梮捸朘 桭掍朘 捸梮掁捸桭';
+
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
new file mode 100644
index 000000000..99483819c
--- /dev/null
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['identitydialogtitle'] = '������������ ��������� 麇���國萼 諻����������.';
+$labels['identitydialoghint'] = '��� 諻���月�� 黖�黕�諢� 諢�篞賄�貲�� ���諤� ��������拘�����.';
+
diff --git a/plugins/new_user_dialog/localization/pt_BR.inc b/plugins/new_user_dialog/localization/pt_BR.inc
index 98c70d590..f53fa44ac 100644
--- a/plugins/new_user_dialog/localization/pt_BR.inc
+++ b/plugins/new_user_dialog/localization/pt_BR.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Por favor complete a sua identidade';
-$labels['identitydialoghint'] = 'Esta caixa aparece apenas uma vez no primeiro login.';
+$labels['identitydialoghint'] = 'Esta tela aparece somente no primeiro acesso.';
 
diff --git a/plugins/new_user_dialog/localization/sr_CS.inc b/plugins/new_user_dialog/localization/sr_CS.inc
new file mode 100644
index 000000000..9042b5795
--- /dev/null
+++ b/plugins/new_user_dialog/localization/sr_CS.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['identitydialogtitle'] = '��郋郅邽邾郋 赲訄�� 迡訄 郈郋郈��郇邽��迮 ��赲郋�� 邽迡迮郇��邽��迮�� 郈郋��邽��訄郋��訄';
+$labels['identitydialoghint'] = '��赲郋 郈郋��迮 ��迮 郈郋��訄赲������迮 ��訄邾郋 ��迮迡郇郋邾 �� 郈��赲郋邾 郅郋迣郋赲訄����';
+
diff --git a/plugins/newmail_notifier/localization/hy_AM.inc b/plugins/newmail_notifier/localization/hy_AM.inc
new file mode 100644
index 000000000..0cbf4122f
--- /dev/null
+++ b/plugins/newmail_notifier/localization/hy_AM.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['basic'] = '��楖����捸掑��掍晙 捰梮梮捸��朘桯晛 晢捸梮楖����楖��桭 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮 桵梲捸梮捸晙晛桵';
+$labels['desktop'] = '��楖����捸掑��掍晙 桵掍梐捸梮捸掑��晛 晢捸梮楖����楖��桭 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮 桵梲捸梮捸晙晛桵';
+$labels['sound'] = '��捸桮梮 桹捸梮掍晙 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮 桵梲捸梮捸晙晛桵';
+$labels['test'] = '��楖��梇捸��朘楖��桭';
+$labels['title'] = '��楖�� 敓晙��楖桵梲';
+$labels['body'] = '埭楖���� 桵梲捸��捸�� 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮';
+$labels['testbody'] = '��捸 ��楖��梇梮捸朘捸梮 晢捸梮楖����楖��桭 敓';
+$labels['desktopdisabled'] = '��掍梐捸梮捸掑��晛 晢捸梮楖����楖��桭梮掍��旍 ��掍�� 捰梮梮捸��朘桯楖��桭 捸梮梬捸梲桴捸晢 掍梮';
+$labels['desktopunsupported'] = '��掍�� 捰梮梮捸��朘晛桯旍 桯楖��梮晛 桵掍梐捸梮捸掑��晛 晢捸梮楖����楖��桭梮掍��晛 桹梮捸��捸桴楖��楖��晥桮楖��梮��';
+
diff --git a/plugins/newmail_notifier/localization/ko_KR.inc b/plugins/newmail_notifier/localization/ko_KR.inc
new file mode 100644
index 000000000..c9641fbf1
--- /dev/null
+++ b/plugins/newmail_notifier/localization/ko_KR.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['basic'] = '���諢���� 諰����鴔�穈� ���麆� ������ 賳���潰�域����� ���謔潰�� ������';
+$labels['desktop'] = '���諢���� 諰����鴔�穈� ���麆� ������ ��域�欠�秒����� ���謔潰�� ������';
+$labels['sound'] = '���諢���� 諰����鴔�穈� ���麆� ������ ���謔� ��科��';
+$labels['test'] = '�����欠��';
+$labels['title'] = '���諢���� 諰���� ���麆�!';
+$labels['body'] = '���諢���� 諰����鴔�諝� ��������������蛟�����.';
+$labels['testbody'] = '��� 窶���� ��������� ���謔潰��������.';
+$labels['desktopdisabled'] = '��寢����� 賳���潰�域�賄�������� ��域�欠�秒����� ���謔潰�� 賱�穈���伕�����諢� �����渥����蛟�����.';
+$labels['desktopunsupported'] = '��寢����� 賳���潰�域�賄�������� ��域�欠�秒����� ���謔潰�� 鴔�������鴔� �����蛟�����.';
+
diff --git a/plugins/newmail_notifier/localization/sr_CS.inc b/plugins/newmail_notifier/localization/sr_CS.inc
new file mode 100644
index 000000000..818f9b60c
--- /dev/null
+++ b/plugins/newmail_notifier/localization/sr_CS.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['test'] = '����郈��郋訇訄��';
+$labels['title'] = '��郋赲邽 邾訄邽郅!';
+$labels['body'] = '����邽邾邽郅邽 ����迮 郇郋赲�� 郈郋����郕��.';
+$labels['testbody'] = '��赲郋 ��迮 ��迮���� 郋訇訄赲迮����迮��迮.';
+
diff --git a/plugins/password/localization/az_AZ.inc b/plugins/password/localization/az_AZ.inc
index 62df01ba8..4d0760da8 100644
--- a/plugins/password/localization/az_AZ.inc
+++ b/plugins/password/localization/az_AZ.inc
@@ -1,24 +1,31 @@
 <?php
 
-/* Azerbaijani translate for password plugin */
-/* Translated by Nadir Aliyev, nadir at ultel dot net */
+/*
+ +-----------------------------------------------------------------------+
+ | localization/az_AZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['changepasswd']  = '��ifr��ni d��yi��';
-$labels['curpasswd']  = 'Hal-haz覺rki ��ifr��:';
-$labels['newpasswd']  = 'Yeni ��ifr��:';
-$labels['confpasswd']  = 'Yeni ��ifr��: (t��krar)';
+$labels['changepasswd'] = '��ifr��ni d��yi��';
+$labels['curpasswd'] = 'Hal-haz覺rki ��ifr��:';
+$labels['newpasswd'] = 'Yeni ��ifr��:';
+$labels['confpasswd'] = 'Yeni ��ifr��: (t��krar)';
+$labels['nopassword'] = 'Yeni ��ifr��ni daxil edin.';
+$labels['nocurpassword'] = 'Hal-haz覺rda istifad�� etdiyiniz ��ifr��ni daxil edin.';
+$labels['passwordincorrect'] = 'Yaln覺�� ��ifr�� daxil etdiniz.';
+$labels['passwordinconsistency'] = 'Yeni daxil etdiyiniz ��ifr��l��r bir-birin�� uy��un deyildir.';
+$labels['crypterror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺. ��ifr��l��m�� metodu tap覺lmad覺.';
+$labels['connecterror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺. Qo��ulma s��hvi.';
+$labels['internalerror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺.';
+$labels['passwordshort'] = 'Yeni ��ifr�� $length simvoldan uzun olmal覺d覺r.';
+$labels['passwordweak'] = '��ifr��d�� he癟 olmasa minimum bir r��q��m v�� simvol olmal覺d覺r.';
+$labels['passwordforbidden'] = '��ifr��d�� icaz�� verilm��y��n simvollar vard覺r.';
 
-$messages = array();
-$messages['nopassword'] = 'Yeni ��ifr��ni daxil edin.';
-$messages['nocurpassword'] = 'Hal-haz覺rda istifad�� etdiyiniz ��ifr��ni daxil edin.';
-$messages['passwordincorrect'] = 'Yaln覺�� ��ifr�� daxil etdiniz.';
-$messages['passwordinconsistency'] = 'Yeni daxil etdiyiniz ��ifr��l��r bir-birin�� uy��un deyildir.';
-$messages['crypterror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺. ��ifr��l��m�� metodu tap覺lmad覺.';
-$messages['connecterror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺. Qo��ulma s��hvi.';
-$messages['internalerror'] = 'Yeni ��ifr��nin saxlan覺lmas覺 m羹mk羹n olmad覺.';
-$messages['passwordshort'] = 'Yeni ��ifr�� $length simvoldan uzun olmal覺d覺r.';
-$messages['passwordweak'] = '��ifr��d�� he癟 olmasa minimum bir r��q��m v�� simvol olmal覺d覺r.';
-$messages['passwordforbidden'] = '��ifr��d�� icaz�� verilm��y��n simvollar vard覺r.';
-
-?>
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
index b4576a0dc..884cb9ec6 100644
--- a/plugins/password/localization/bg_BG.inc
+++ b/plugins/password/localization/bg_BG.inc
@@ -1,18 +1,28 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = '苤邾��郇訄 郇訄 郈訄��郋郅訄';
-$labels['curpasswd']  = '苠迮郕����訄 郈訄��郋郅訄:';
-$labels['newpasswd']  = '��郋赲訄 郈訄��郋郅訄:';
-$labels['confpasswd']  = '��郋赲��郋��迮��迮:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bg_BG/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = '��郋郅�� 赲��赲迮迡迮��迮 郇郋赲訄 郈訄��郋郅訄.';
-$messages['nocurpassword'] = '��郋郅�� 赲��赲迮迡迮��迮 ��迮郕����訄��訄 .';
-$messages['passwordincorrect'] = '��迮赲訄郅邽迡郇訄 ��迮郕����訄 郈訄��郋郅訄.';
-$messages['passwordinconsistency'] = '��訄��郋郅邽��迮 郇迮 ����赲郈訄迡訄��, 郋郈邽��訄邿��迮 郈訄郕.';
-$messages['crypterror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄. ����迮��郕訄 赲 郕��邽郈��邽��訄郇迮��郋.';
-$messages['connecterror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄. ����迮��郕訄 赲 ��赲����郱赲訄郇迮��郋.';
-$messages['internalerror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄.';
+$labels = array();
+$labels['changepasswd'] = '苤邾��郇訄 郇訄 郈訄��郋郅訄';
+$labels['curpasswd'] = '苠迮郕����訄 郈訄��郋郅訄:';
+$labels['newpasswd'] = '��郋赲訄 郈訄��郋郅訄:';
+$labels['confpasswd'] = '��郋赲��郋��迮��迮:';
+$labels['nopassword'] = '��郋郅�� 赲��赲迮迡迮��迮 郇郋赲訄 郈訄��郋郅訄.';
+$labels['nocurpassword'] = '��郋郅�� 赲��赲迮迡迮��迮 ��迮郕����訄��訄 .';
+$labels['passwordincorrect'] = '��迮赲訄郅邽迡郇訄 ��迮郕����訄 郈訄��郋郅訄.';
+$labels['passwordinconsistency'] = '��訄��郋郅邽��迮 郇迮 ����赲郈訄迡訄��, 郋郈邽��訄邿��迮 郈訄郕.';
+$labels['crypterror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄. ����迮��郕訄 赲 郕��邽郈��邽��訄郇迮��郋.';
+$labels['connecterror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄. ����迮��郕訄 赲 ��赲����郱赲訄郇迮��郋.';
+$labels['internalerror'] = '��訄��郋郅訄��訄 郇迮 邾郋迠迮 迡訄 訇��迡迮 ��邾迮郇迮郇訄.';
 
-?>
diff --git a/plugins/password/localization/bs_BA.inc b/plugins/password/localization/bs_BA.inc
new file mode 100644
index 000000000..3ec0d552a
--- /dev/null
+++ b/plugins/password/localization/bs_BA.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = 'Promijeni 禳ifru';
+$labels['curpasswd'] = 'Trenutna 禳ifra:';
+$labels['newpasswd'] = 'Nova 禳ifra:';
+$labels['confpasswd'] = 'Potvrdite novu 禳ifru:';
+$labels['nopassword'] = 'Molimo vas da upi禳ete novu 禳ifru.';
+$labels['nocurpassword'] = 'Molimo vas da upi禳ete trenutnu 禳ifru.';
+$labels['passwordincorrect'] = 'Trenutna 禳ifra je neta��na.';
+$labels['passwordinconsistency'] = '��ifre se ne podudaraju, molimo vas da poku禳ate ponovo.';
+$labels['crypterror'] = 'Nije mogu��e sa��uvati 禳ifre. Nedostaje funkcija za enkripciju.';
+$labels['connecterror'] = 'Nije mogu��e sa��uvati 禳ifre. Gre禳ka u povezivanju.';
+$labels['internalerror'] = 'Nije mogu��e sa��uvati novu 禳ifru.';
+$labels['passwordshort'] = '��ifra mora sadr鱉avati barem $length znakova.';
+$labels['passwordweak'] = '��ifra mora imati barem jedan broj i jedan interpunkcijski znak.';
+$labels['passwordforbidden'] = '��ifra sadr鱉i nedozvoljene znakove.';
+
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 18c10c80e..8832f3f6d 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -1,20 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Canviar contrasenya';
-$labels['curpasswd']  = 'Contrasenya actual:';
-$labels['newpasswd']  = 'Nova contrasenya:';
-$labels['confpasswd']  = 'Confirmar nova contrasenya:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Si us plau, introdueix la nova contrasenya.';
-$messages['nocurpassword'] = 'Si us plau, introdueix la contrasenya actual.';
-$messages['passwordincorrect'] = 'Contrasenya actual incorrecte.';
-$messages['passwordinconsistency'] = 'La contrasenya nova no coincideix!.';
-$messages['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funci籀 d\'encriptaci籀.';
-$messages['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexi籀.';
-$messages['internalerror'] = 'No es pot desar la nova contrasenya.';
-$messages['passwordshort'] = 'La nova contrasenya ha de tenir com a m穩nim $length car��cters de llarg.';
-$messages['passwordweak'] = 'La nova contrasenya ha d\'incloure com a m穩nim un nombre i un car��cter de puntuaci籀.';
+$labels = array();
+$labels['changepasswd'] = 'Canvia la contrasenya';
+$labels['curpasswd'] = 'Contrasenya actual:';
+$labels['newpasswd'] = 'Nova contrasenya:';
+$labels['confpasswd'] = 'Confirmeu la nova contrasenya:';
+$labels['nopassword'] = 'Si us plau, introdu簿u la nova contrasenya.';
+$labels['nocurpassword'] = 'Si us plau, introdu簿u la contrasenya actual.';
+$labels['passwordincorrect'] = 'Contrasenya actual incorrecta.';
+$labels['passwordinconsistency'] = 'La contrasenya nova no coincideix, torneu-ho a provar.';
+$labels['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funci籀 d\'encriptaci籀.';
+$labels['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexi籀.';
+$labels['internalerror'] = 'No es pot desar la nova contrasenya.';
+$labels['passwordshort'] = 'La nova contrasenya ha de tenir com a m穩nim $length car��cters de llarg.';
+$labels['passwordweak'] = 'La nova contrasenya ha d\'incloure com a m穩nim un nombre i un car��cter de puntuaci籀.';
+$labels['passwordforbidden'] = 'La contrasenya cont矇 car��cters no permesos.';
 
-?>
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
index b4b7b29f9..2ed792376 100644
--- a/plugins/password/localization/cs_CZ.inc
+++ b/plugins/password/localization/cs_CZ.inc
@@ -1,30 +1,31 @@
 <?php
 
-/**
- * Czech translation for Roundcube password plugin
- *
- * @version 1.0 (2009-08-29)
- * @author Milan Kozak <hodza@hodza.net>
- * @author Tom獺禳 ��afa��穩k <safarik@server.cz>
- *
- */
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['changepasswd']  = 'Zm��na hesla';
-$labels['curpasswd']  = 'Aktu獺ln穩 heslo:';
-$labels['newpasswd']  = 'Nov矇 heslo:';
-$labels['confpasswd']  = 'Nov矇 heslo (pro kontrolu):';
+$labels['changepasswd'] = 'Zm��na hesla';
+$labels['curpasswd'] = 'Aktu獺ln穩 heslo:';
+$labels['newpasswd'] = 'Nov矇 heslo:';
+$labels['confpasswd'] = 'Nov矇 heslo (pro kontrolu):';
+$labels['nopassword'] = 'Pros穩m zadejte nov矇 heslo.';
+$labels['nocurpassword'] = 'Pros穩m zadejte aktu獺ln穩 heslo.';
+$labels['passwordincorrect'] = 'Zadan矇 aktu獺ln穩 heslo nen穩 spr獺vn矇.';
+$labels['passwordinconsistency'] = 'Zadan獺 hesla se neshoduj穩. Pros穩m zkuste to znovu.';
+$labels['crypterror'] = 'Heslo se nepoda��ilo ulo鱉it. Chyb穩 禳ifrovac穩 funkce.';
+$labels['connecterror'] = 'Heslo se nepoda��ilo ulo鱉it. Probl矇m s p��ipojen穩m.';
+$labels['internalerror'] = 'Heslo se nepoda��ilo ulo鱉it.';
+$labels['passwordshort'] = 'Heslo mus穩 m穩t alespo�� $length znak轡.';
+$labels['passwordweak'] = 'Heslo mus穩 obsahovat alespo�� jedno ��穩slo a jedno interpukn��n穩 znam矇nko.';
+$labels['passwordforbidden'] = 'Heslo obsahuje nepovolen矇 znaky.';
 
-$messages = array();
-$messages['nopassword'] = 'Pros穩m zadejte nov矇 heslo.';
-$messages['nocurpassword'] = 'Pros穩m zadejte aktu獺ln穩 heslo.';
-$messages['passwordincorrect'] = 'Zadan矇 aktu獺ln穩 heslo nen穩 spr獺vn矇.';
-$messages['passwordinconsistency'] = 'Zadan獺 hesla se neshoduj穩. Pros穩m zkuste to znovu.';
-$messages['crypterror'] = 'Heslo se nepoda��ilo ulo鱉it. Chyb穩 禳ifrovac穩 funkce.';
-$messages['connecterror'] = 'Heslo se nepoda��ilo ulo鱉it. Probl矇m s p��ipojen穩m.';
-$messages['internalerror'] = 'Heslo se nepoda��ilo ulo鱉it.';
-$messages['passwordshort'] = 'Heslo mus穩 m穩t alespo�� $length znak轡.';
-$messages['passwordweak'] = 'Heslo mus穩 obsahovat alespo�� jedno ��穩slo a jedno interpukn��n穩 znam矇nko.';
-$messages['passwordforbidden'] = 'Heslo obsahuje nepovolen矇 znaky.';
-
-?>
diff --git a/plugins/password/localization/cy_GB.inc b/plugins/password/localization/cy_GB.inc
new file mode 100644
index 000000000..0cdad07d5
--- /dev/null
+++ b/plugins/password/localization/cy_GB.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Dafydd Tomos                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = 'Newid Cyfrinair';
+$labels['curpasswd'] = 'Cyfrinair Presennol:';
+$labels['newpasswd'] = 'Cyfrinair Newydd:';
+$labels['confpasswd'] = 'Cadarnhau Cyfrinair Newydd:';
+$labels['nopassword'] = 'Rhowch eich cyfrinair newydd.';
+$labels['nocurpassword'] = 'Rhowch eich cyfrinair presennol.';
+$labels['passwordincorrect'] = 'Roedd y cyfrinair presennol yn anghywir.';
+$labels['passwordinconsistency'] = 'Nid yw\'r cyfrineiriau yn cymharu, ceisiwch eto.';
+$labels['crypterror'] = 'Methwyd cadw\'r cyfrinair newydd. Ffwythiant amgodi ar goll.';
+$labels['connecterror'] = 'Methwyd cadw\'r cyfrinair newydd. Gwall cysylltiad.';
+$labels['internalerror'] = 'Methwyd cadw\'r cyfrinair newydd.';
+$labels['passwordshort'] = 'Rhaid i\'r cyfrinair fod o leia $length llythyren o hyd.';
+$labels['passwordweak'] = 'Rhaid i\'r cyfrinair gynnwys o leia un rhif a un cymeriad atalnodi.';
+$labels['passwordforbidden'] = 'Mae\'r cyfrinair yn cynnwys llythrennau wedi gwahardd.';
+
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
index 5d1d0c9cc..8c411265d 100644
--- a/plugins/password/localization/da_DK.inc
+++ b/plugins/password/localization/da_DK.inc
@@ -1,18 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Skift adgangskode';
-$labels['curpasswd']  = 'Nuv疆rende adgangskode:';
-$labels['newpasswd']  = 'Ny adgangskode:';
-$labels['confpasswd']  = 'Bekr疆ft ny adgangskode:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Johannes Hessellund <osos@openeyes.dk>                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Indtast venligst en ny adgangskode.';
-$messages['nocurpassword'] = 'Indtast venligst nyv疆rende adgangskode.';
-$messages['passwordincorrect'] = 'Nyv疆rende adgangskode er forkert.';
-$messages['passwordinconsistency'] = 'Adgangskoderne er ikke ens, pr繪v igen.';
-$messages['crypterror'] = 'Kunne ikke gemme den nye adgangskode. Krypteringsfunktion mangler.';
-$messages['connecterror'] = 'Kunne ikke gemme den nye adgangskode. Fejl ved forbindelsen.';
-$messages['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
+$labels = array();
+$labels['changepasswd'] = 'Skift adgangskode';
+$labels['curpasswd'] = 'Nuv疆rende adgangskode:';
+$labels['newpasswd'] = 'Ny adgangskode:';
+$labels['confpasswd'] = 'Bekr疆ft ny adgangskode:';
+$labels['nopassword'] = 'Indtast venligst en ny adgangskode.';
+$labels['nocurpassword'] = 'Indtast venligst nuv疆rende adgangskode.';
+$labels['passwordincorrect'] = 'Nuv疆rende adgangskode er forkert.';
+$labels['passwordinconsistency'] = 'Adgangskoderne er ikke ens, pr繪v igen.';
+$labels['crypterror'] = 'Kunne ikke gemme den nye adgangskode. Krypteringsfunktion mangler.';
+$labels['connecterror'] = 'Kunne ikke gemme den nye adgangskode. Fejl ved forbindelsen.';
+$labels['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
+$labels['passwordshort'] = 'Adgangskoden skal v疆re mindst $length tegn lang.';
+$labels['passwordweak'] = 'Adgangskoden skal indeholde mindst et tal og et tegns疆tningstegn (-.,)';
+$labels['passwordforbidden'] = 'Adgangskoden indeholder forbudte tegn.';
 
-?>
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
index a28990d67..492a48df0 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -1,19 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Passwort 瓣ndern';
-$labels['curpasswd']  = 'Aktuelles Passwort';
-$labels['newpasswd']  = 'Neues Passwort';
-$labels['confpasswd']  = 'Passwort Wiederholung';
-
-$messages = array();
-$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein";
-$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an";
-$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt";
-$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht 羹berein";
-$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschl羹sselungsfunktion fehlt";
-$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler";
-$messages['internalerror'] = "Neues Passwort nicht gespeichert";
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
+$labels = array();
+$labels['changepasswd'] = 'Passwort 瓣ndern';
+$labels['curpasswd'] = 'Aktuelles Passwort';
+$labels['newpasswd'] = 'Neues Passwort';
+$labels['confpasswd'] = 'Passwort Wiederholung';
+$labels['nopassword'] = 'Bitte geben Sie ein neues Passwort ein';
+$labels['nocurpassword'] = 'Bitte geben Sie Ihr aktuelles Passwort an';
+$labels['passwordincorrect'] = 'Das aktuelle Passwort ist nicht korrekt';
+$labels['passwordinconsistency'] = 'Das neue Passwort und dessen Wiederholung stimmen nicht 羹berein';
+$labels['crypterror'] = 'Neues Passwort nicht gespeichert: Verschl羹sselungsfunktion fehlt';
+$labels['connecterror'] = 'Neues Passwort nicht gespeichert: Verbindungsfehler';
+$labels['internalerror'] = 'Neues Passwort nicht gespeichert';
+$labels['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
+$labels['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
+$labels['passwordforbidden'] = 'Passwort enth瓣lt unzul瓣ssige Zeichen.';
 
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
index a28990d67..6a188e175 100644
--- a/plugins/password/localization/de_DE.inc
+++ b/plugins/password/localization/de_DE.inc
@@ -1,19 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Passwort 瓣ndern';
-$labels['curpasswd']  = 'Aktuelles Passwort';
-$labels['newpasswd']  = 'Neues Passwort';
-$labels['confpasswd']  = 'Passwort Wiederholung';
-
-$messages = array();
-$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein";
-$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an";
-$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt";
-$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht 羹berein";
-$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschl羹sselungsfunktion fehlt";
-$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler";
-$messages['internalerror'] = "Neues Passwort nicht gespeichert";
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moritz H繹wer <moritzhoewermail@gmx.de>                       |
+ +-----------------------------------------------------------------------+
+*/
 
+$labels = array();
+$labels['changepasswd'] = 'Kennwort 瓣ndern';
+$labels['curpasswd'] = 'Aktuelles Kennwort:';
+$labels['newpasswd'] = 'Neues Kennwort:';
+$labels['confpasswd'] = 'Neues Kennwort best瓣tigen:';
+$labels['nopassword'] = 'Bitte geben Sie ein neues Kennwort ein.';
+$labels['nocurpassword'] = 'Bitte geben Sie ihr aktuelles Kennwort ein.';
+$labels['passwordincorrect'] = 'Das aktuelle Kennwort ist falsch.';
+$labels['passwordinconsistency'] = 'Das neue Passwort und dessen Wiederholung stimmen nicht 羹berein';
+$labels['crypterror'] = 'Neues Passwort nicht gespeichert: Verschl羹sselungsfunktion fehlt';
+$labels['connecterror'] = 'Neues Passwort nicht gespeichert: Verbindungsfehler';
+$labels['internalerror'] = 'Neues Passwort nicht gespeichert';
+$labels['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
+$labels['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
+$labels['passwordforbidden'] = 'Passwort enth瓣lt unzul瓣ssige Zeichen.';
 
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/en_GB.inc b/plugins/password/localization/en_GB.inc
new file mode 100644
index 000000000..57f0d83e9
--- /dev/null
+++ b/plugins/password/localization/en_GB.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kevin Beynon                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = 'Change Password';
+$labels['curpasswd'] = 'Current Password:';
+$labels['newpasswd'] = 'New Password:';
+$labels['confpasswd'] = 'Confirm New Password:';
+$labels['nopassword'] = 'Please enter a new password.';
+$labels['nocurpassword'] = 'Please enter the current password.';
+$labels['passwordincorrect'] = 'Current password is incorrect.';
+$labels['passwordinconsistency'] = 'Passwords do not match.  Please try again.';
+$labels['crypterror'] = 'New password could not be saved.  The encryption function is missing.';
+$labels['connecterror'] = 'New password could not be saved.  There is a connection error.';
+$labels['internalerror'] = 'New password could not be saved.';
+$labels['passwordshort'] = 'Password must be at least $length characters long.';
+$labels['passwordweak'] = 'Password must include at least one number and one symbol.';
+$labels['passwordforbidden'] = 'Password contains forbidden characters.';
+
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
new file mode 100644
index 000000000..fe6ef933b
--- /dev/null
+++ b/plugins/password/localization/eo.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/eo/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Baptiste Darthenay <bapdarth@yahoo.fr>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '��an��i pasvorton';
+$labels['curpasswd'] = 'Nuna pasvorto:';
+$labels['newpasswd'] = 'Nova pasvorto:';
+$labels['confpasswd'] = 'Konfirmi novan pasvorton:';
+$labels['nopassword'] = 'Bonvolu tajpi novan pasvorton.';
+$labels['nocurpassword'] = 'Bonvolu tajpi nunan pasvorton.';
+$labels['passwordincorrect'] = 'Nuna pasvorto nekorakta.';
+$labels['passwordinconsistency'] = 'Pasvortoj ne ta躑gas, bonvolu provi denove.';
+$labels['crypterror'] = 'Ne povis konservi la pasvorton: ��ifrada funkcio maltrovita.';
+$labels['connecterror'] = 'Ne povis konservi la pasvorton: konekta eraro.';
+$labels['internalerror'] = 'Ne povis konservi novan pasvorton.';
+$labels['passwordshort'] = 'Pasvorto devas havi almana躑 $length signojn.';
+$labels['passwordweak'] = 'La pasvorto devus havi almena躑 unu ciferon kaj unu interpunktan signon.';
+$labels['passwordforbidden'] = 'La pasvorto enhavas malpermesajn signojn.';
+
diff --git a/plugins/password/localization/es_AR.inc b/plugins/password/localization/es_AR.inc
index 40c74e673..d8c5ad336 100644
--- a/plugins/password/localization/es_AR.inc
+++ b/plugins/password/localization/es_AR.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Cambiar Contrase簽a';
-$labels['curpasswd']  = 'Contrase簽a Actual:';
-$labels['newpasswd']  = 'Contrase簽a Nueva:';
-$labels['confpasswd']  = 'Confirmar Contrase簽a:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_AR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Por favor introduce una nueva contrase簽a.';
-$messages['nocurpassword'] = 'Por favor introduce la contrase簽a actual.';
-$messages['passwordincorrect'] = 'Contrase簽a actual incorrecta.';
-$messages['passwordinconsistency'] = 'Las contrase簽as no coinciden, por favor int矇ntalo de nuevo.';
-$messages['crypterror'] = 'No se pudo guardar la contrase簽a nueva. Falta la funci籀n de cifrado.';
-$messages['connecterror'] = 'No se pudo guardar la contrase簽a nueva. Error de conexi籀n';
-$messages['internalerror'] = 'No se pudo guardar la contrase簽a nueva.';
-$messages['passwordshort'] = 'Tu contrase簽a debe tener una longitud m穩nima de $length.';
-$messages['passwordweak'] = 'Tu nueva contrase簽a debe incluir al menos un n繳mero y un signo de puntuaci籀n.';
-$messages['passwordforbidden'] = 'La contrase簽a contiene caracteres inv獺lidos.';
+$labels = array();
+$labels['changepasswd'] = 'Cambiar Contrase簽a';
+$labels['curpasswd'] = 'Contrase簽a Actual:';
+$labels['newpasswd'] = 'Contrase簽a Nueva:';
+$labels['confpasswd'] = 'Confirmar Contrase簽a:';
+$labels['nopassword'] = 'Por favor introduce una nueva contrase簽a.';
+$labels['nocurpassword'] = 'Por favor introduce la contrase簽a actual.';
+$labels['passwordincorrect'] = 'Contrase簽a actual incorrecta.';
+$labels['passwordinconsistency'] = 'Las contrase簽as no coinciden, por favor int矇ntalo de nuevo.';
+$labels['crypterror'] = 'No se pudo guardar la contrase簽a nueva. Falta la funci籀n de cifrado.';
+$labels['connecterror'] = 'No se pudo guardar la contrase簽a nueva. Error de conexi籀n';
+$labels['internalerror'] = 'No se pudo guardar la contrase簽a nueva.';
+$labels['passwordshort'] = 'Tu contrase簽a debe tener una longitud m穩nima de $length.';
+$labels['passwordweak'] = 'Tu nueva contrase簽a debe incluir al menos un n繳mero y un signo de puntuaci籀n.';
+$labels['passwordforbidden'] = 'La contrase簽a contiene caracteres inv獺lidos.';
 
-?>
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
index 32879b4aa..f61e25e99 100644
--- a/plugins/password/localization/es_ES.inc
+++ b/plugins/password/localization/es_ES.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Cambiar contrase簽a';
-$labels['curpasswd']  = 'Contrase簽a actual:';
-$labels['newpasswd']  = 'Contrase簽a nueva:';
-$labels['confpasswd']  = 'Confirmar contrase簽a:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Por favor introduzca una contrase簽a nueva.';
-$messages['nocurpassword'] = 'Por favor introduzca la contrase簽a actual.';
-$messages['passwordincorrect'] = 'La contrase簽a actual es incorrecta.';
-$messages['passwordinconsistency'] = 'Las contrase簽as no coinciden. Por favor, int矇ntelo de nuevo.';
-$messages['crypterror'] = 'No se pudo guardar la contrase簽a nueva. Falta la funci籀n de cifrado.';
-$messages['connecterror'] = 'No se pudo guardar la contrase簽a nueva. Error de conexi籀n';
-$messages['internalerror'] = 'No se pudo guardar la contrase簽a nueva.';
-$messages['passwordshort'] = 'La contrase簽a debe tener por lo menos $length caracteres.';
-$messages['passwordweak'] = 'La contrase簽a debe incluir al menos un n繳mero y un signo de puntuaci籀n.';
-$messages['passwordforbidden'] = 'La contrase簽a introducida contiene caracteres no permitidos.';
+$labels = array();
+$labels['changepasswd'] = 'Cambiar contrase簽a';
+$labels['curpasswd'] = 'Contrase簽a actual:';
+$labels['newpasswd'] = 'Contrase簽a nueva:';
+$labels['confpasswd'] = 'Confirmar contrase簽a:';
+$labels['nopassword'] = 'Por favor introduzca una contrase簽a nueva.';
+$labels['nocurpassword'] = 'Por favor introduzca la contrase簽a actual.';
+$labels['passwordincorrect'] = 'La contrase簽a actual es incorrecta.';
+$labels['passwordinconsistency'] = 'Las contrase簽as no coinciden. Por favor, int矇ntelo de nuevo.';
+$labels['crypterror'] = 'No se pudo guardar la contrase簽a nueva. Falta la funci籀n de cifrado.';
+$labels['connecterror'] = 'No se pudo guardar la contrase簽a nueva. Error de conexi籀n';
+$labels['internalerror'] = 'No se pudo guardar la contrase簽a nueva.';
+$labels['passwordshort'] = 'La contrase簽a debe tener por lo menos $length caracteres.';
+$labels['passwordweak'] = 'La contrase簽a debe incluir al menos un n繳mero y un signo de puntuaci籀n.';
+$labels['passwordforbidden'] = 'La contrase簽a introducida contiene caracteres no permitidos.';
 
-?>
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index 0f351d77b..8ae7bd4a1 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -1,17 +1,27 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Muuda parooli';
-$labels['curpasswd']  = 'Vana parool:';
-$labels['newpasswd']  = 'Uus parool:';
-$labels['confpasswd']  = 'Uus parool uuesti:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Palun sisesta uus parool.';
-$messages['nocurpassword'] = 'Palun sisesta vana parool.';
-$messages['passwordincorrect'] = 'Vana parool on vale.';
-$messages['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
-$messages['crypterror'] = 'Serveris ei ole parooli kr羹pteerimiseks vajalikku funktsiooni.';
-$messages['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
+$labels = array();
+$labels['changepasswd'] = 'Muuda parooli';
+$labels['curpasswd'] = 'Vana parool:';
+$labels['newpasswd'] = 'Uus parool:';
+$labels['confpasswd'] = 'Uus parool uuesti:';
+$labels['nopassword'] = 'Palun sisesta uus parool.';
+$labels['nocurpassword'] = 'Palun sisesta vana parool.';
+$labels['passwordincorrect'] = 'Vana parool on vale.';
+$labels['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
+$labels['crypterror'] = 'Serveris ei ole parooli kr羹pteerimiseks vajalikku funktsiooni.';
+$labels['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
 
-?>
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
new file mode 100644
index 000000000..6e016f992
--- /dev/null
+++ b/plugins/password/localization/fa_IR.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_IR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hamid <abbaszadeh.h@gmail.com>                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '堛媞����堭 堭��堬媢堥��堭';
+$labels['curpasswd'] = '堭��堬媢堥��堭 ��媢����';
+$labels['newpasswd'] = '堭��堬媢堥��堭 堿堹��堹';
+$labels['confpasswd'] = '堛塈����堹 堭��堬媢堥��堭 堿堹��堹';
+$labels['nopassword'] = '堭��堬媢堥��堭 堿堹��堹 堭塈 ��塈堭堹 ����塈����堹';
+$labels['nocurpassword'] = '堭��堬媢堥��堭 ��媢���� 堭塈 ��塈堭堹 ����塈����堹';
+$labels['passwordincorrect'] = '堭��堬媢堥��堭 ��媢���� 塈奡堛堥塈�� 塈堻堛';
+$labels['passwordinconsistency'] = '堭��堬媢堥��堭��塈 堥塈 ���� ��媟塈堥��堛 ��堹塈堭��堹�� 堹��堥塈堭�� 堻媢�� ����塈����堹.';
+$labels['internalerror'] = '堭��堬媢堥��堭 堿堹��堹 堸堮��堭�� ��奡堹';
+
diff --git a/plugins/password/localization/fi_FI.inc b/plugins/password/localization/fi_FI.inc
index a2108a524..5e4608017 100644
--- a/plugins/password/localization/fi_FI.inc
+++ b/plugins/password/localization/fi_FI.inc
@@ -1,22 +1,31 @@
 <?php
 
-// Translation by Tapio Salonsaari <take@nerd.fi>
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Gr繹nroos                                                |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['changepasswd']  = 'Vaihda salasana';
-$labels['curpasswd']  = 'Nykyinen salasana:';
-$labels['newpasswd']  = 'Uusi salasana:';
-$labels['confpasswd']  = 'Uusi salasana uudestaan:';
+$labels['changepasswd'] = 'Vaihda salasana';
+$labels['curpasswd'] = 'Nykyinen salasana:';
+$labels['newpasswd'] = 'Uusi salasana:';
+$labels['confpasswd'] = 'Uusi salasana uudestaan:';
+$labels['nopassword'] = 'Sy繹t瓣 uusi salasana.';
+$labels['nocurpassword'] = 'Sy繹t瓣 nykyinen salasana.';
+$labels['passwordincorrect'] = 'Sy繹tt瓣m瓣si nykyinen salasana on v瓣瓣rin.';
+$labels['passwordinconsistency'] = 'Sy繹tt瓣m瓣si salasanat eiv瓣t t瓣sm瓣瓣, yrit瓣 uudelleen.';
+$labels['crypterror'] = 'Salasanaa ei voitu vaihtaa. Kryptausfunktio puuttuu.';
+$labels['connecterror'] = 'Salasanaa ei voitu vaihtaa. Yhteysongelma.';
+$labels['internalerror'] = 'Salasanaa ei voitu vaihtaa.';
+$labels['passwordshort'] = 'Salasanan t瓣ytyy olla v瓣hint瓣瓣n $length merkki瓣 pitk瓣.';
+$labels['passwordweak'] = 'Salasanan t瓣ytyy sis瓣lt瓣瓣 v瓣hint瓣瓣n yksi numero ja yksi v瓣limerkki.';
+$labels['passwordforbidden'] = 'Salasana sis瓣lt瓣瓣 kiellettyj瓣 merkkej瓣.';
 
-$messages = array();
-$messages['nopassword'] = 'Sy繹t瓣 uusi salasana.';
-$messages['nocurpassword'] = 'Sy繹t瓣 nykyinen salasana.';
-$messages['passwordincorrect'] = 'Sy繹tt瓣m瓣si nykyinen salasana on v瓣瓣rin.';
-$messages['passwordinconsistency'] = 'Sy繹tt瓣m瓣si salasanat eiv瓣t t瓣sm瓣瓣, yrit瓣 uudelleen.';
-$messages['crypterror'] = 'Salasanaa ei voitu vaihtaa. Kryptausfunktio puuttuu.';
-$messages['connecterror'] = 'Salasanaa ei voitu vaihtaa. Yhteysongelma.';
-$messages['internalerror'] = 'Salasanaa ei voitu vaihtaa.';
-$messages['passwordshort'] = 'Salasanan t瓣ytyy olla v瓣hint瓣瓣n $length merkki瓣 pitk瓣.';
-$messages['passwordweak'] = 'Salasanan t瓣ytyy sis瓣lt瓣瓣 v瓣hint瓣瓣n yksi numero ja yksi v瓣limerkki.';
-
-?>
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index 8ba37b148..f90c32b3c 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -1,18 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Changer le mot de passe';
-$labels['curpasswd']  = 'Mot de passe actuel:';
-$labels['newpasswd']  = 'Nouveau mot de passe:';
-$labels['confpasswd']  = 'Confirmez le nouveau mot de passe:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nicolas Delvaux                                               |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
-$messages['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
-$messages['passwordincorrect'] = 'Mot de passe actuel incorrect.';
-$messages['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez r矇essayer.';
-$messages['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
-$messages['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
-$messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
+$labels = array();
+$labels['changepasswd'] = 'Changer le mot de passe';
+$labels['curpasswd'] = 'Mot de passe actuel:';
+$labels['newpasswd'] = 'Nouveau mot de passe:';
+$labels['confpasswd'] = 'Confirmez le nouveau mot de passe:';
+$labels['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
+$labels['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
+$labels['passwordincorrect'] = 'Mot de passe actuel incorrect.';
+$labels['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez r矇essayer.';
+$labels['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
+$labels['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
+$labels['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
+$labels['passwordshort'] = 'Le mot de passe doit 礙tre compos矇 d\'au moins $length caract癡res.';
+$labels['passwordweak'] = 'Le mot de passe doit contenir au moins un chiffre et un signe de ponctuation.';
+$labels['passwordforbidden'] = 'Le mot de passe contient des caract癡res interdits.';
 
-?>
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index b7dc7bbee..90c940e59 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Cambiar contrasinal';
-$labels['curpasswd']  = 'Contrasinal actual:';
-$labels['newpasswd']  = 'Contrasinal novo:';
-$labels['confpasswd']  = 'Confirmar contrasinal:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Por favor, introduza un contrasinal novo.';
-$messages['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
-$messages['passwordincorrect'] = 'O contrasinal actual 矇 incorrecto.';
-$messages['passwordinconsistency'] = 'Os contrasinals non coinciden. Por favor, int矇nteo de novo.';
-$messages['crypterror'] = 'Non foi posible gardar o contrasinal novo. Falta a funci籀n de cifrado.';
-$messages['connecterror'] = 'Non foi posible gardar o contrasinal novo. Erro de conexi籀n';
-$messages['internalerror'] = 'Non foi posible gardar o contrasinal novo.';
-$messages['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
-$messages['passwordweak'] = 'O contrasinal debe incluir polo menos un n繳mero e un signo de puntuaci籀n.';
-$messages['passwordforbidden'] = 'O contrasinal cont矇n caracteres non permitidos.';
+$labels = array();
+$labels['changepasswd'] = 'Cambiar contrasinal';
+$labels['curpasswd'] = 'Contrasinal actual:';
+$labels['newpasswd'] = 'Contrasinal novo:';
+$labels['confpasswd'] = 'Confirmar contrasinal:';
+$labels['nopassword'] = 'Por favor, introduza un contrasinal novo.';
+$labels['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
+$labels['passwordincorrect'] = 'O contrasinal actual 矇 incorrecto.';
+$labels['passwordinconsistency'] = 'Os contrasinals non coinciden. Por favor, int矇nteo de novo.';
+$labels['crypterror'] = 'Non foi posible gardar o contrasinal novo. Falta a funci籀n de cifrado.';
+$labels['connecterror'] = 'Non foi posible gardar o contrasinal novo. Erro de conexi籀n';
+$labels['internalerror'] = 'Non foi posible gardar o contrasinal novo.';
+$labels['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
+$labels['passwordweak'] = 'O contrasinal debe incluir polo menos un n繳mero e un signo de puntuaci籀n.';
+$labels['passwordforbidden'] = 'O contrasinal cont矇n caracteres non permitidos.';
 
-?>
diff --git a/plugins/password/localization/he_IL.inc b/plugins/password/localization/he_IL.inc
new file mode 100644
index 000000000..143e2c5af
--- /dev/null
+++ b/plugins/password/localization/he_IL.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '蚸�������� 蛂��蛂����';
+$labels['curpasswd'] = '蛂��蛂���� ����������蛌:';
+$labels['newpasswd'] = '蛂��蛂���� ����蚸��:';
+$labels['confpasswd'] = '��������蛌 ��蛂��蛂���� ������蚸��:';
+$labels['nopassword'] = '���� ����蚹������ 蛂��蛂���� ����蚸��';
+$labels['nocurpassword'] = '���� ����蚹��蚸 ��蛂��蛂���� ������������蛌';
+$labels['passwordincorrect'] = '����蚹蚸�� 蛂��蛂���� ����������蛌 蚸��������';
+$labels['passwordinconsistency'] = '��蛂��蛂������蛌 蚸����蚹蚸�� �������� 蛌��������蛌, ���� ����蛂��蛌 蚸����蛌.';
+$labels['crypterror'] = '���� ��蚸��蚳�� ��蛂��蛂���� ������蚸��. ��蛂蚳 ������������ ��蛈蚺����.';
+$labels['connecterror'] = '���� ��蚸��蚳�� ��蛂��蛂���� ������蚸��. 蚸������蛌 蛌蚹蚸��蚳蛌.';
+$labels['internalerror'] = '���� ����蛌�� ��蚸����蚳 蛁�� ��蛂��蛂���� ������蚸��.';
+$labels['passwordshort'] = '��蛂��蛂���� 蛈蚳������ ��������蛌 ��蚺����蛌 ��蛁��蛌 $length 蛌��������';
+$labels['passwordweak'] = '��蛂��蛂���� ��������蛌 ���������� ��蚺����蛌 蛂��蚺蚳�� ����蛌 ����蚺����蛌 蛂������ 蚺��蛂��蚹 ������.';
+$labels['passwordforbidden'] = '��蛂��蛂���� ���������� 蛌�������� ��蛂��蚳����.';
+
diff --git a/plugins/password/localization/hr_HR.inc b/plugins/password/localization/hr_HR.inc
index 0e35129c0..ece203d3c 100644
--- a/plugins/password/localization/hr_HR.inc
+++ b/plugins/password/localization/hr_HR.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Promijeni zaporku';
-$labels['curpasswd']  = 'Va鱉e��a zaporka:';
-$labels['newpasswd']  = 'Nova zaporka:';
-$labels['confpasswd']  = 'Potvrda nove zaporke:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hr_HR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Molimo unesite novu zaporku.';
-$messages['nocurpassword'] = 'Molimo unesite trenutnu zaporku.';
-$messages['passwordincorrect'] = 'Trenutna zaporka je neva鱉e��a.';
-$messages['passwordinconsistency'] = 'Zaporke su razli��ite, poku禳ajte ponovo.';
-$messages['crypterror'] = 'Nemogu��e promijeniti zaporku. Nedostaje enkripcijska funkcija.';
-$messages['connecterror'] = 'Nemogu��e promijeniti zaporku. Gre禳ka prilikom spajanja.';
-$messages['internalerror'] = 'Nemogu��e promijeniti zaporku.';
-$messages['passwordshort'] = 'Zaporka mora sadr鱉avati barem $length znakova.';
-$messages['passwordweak'] = 'Zaporka mora sadr鱉avati barem jedanu znamenku i jedan interpunkcijski znak.';
-$messages['passwordforbidden'] = 'Zaporka sadr鱉i nedozvoljene znakove.';
+$labels = array();
+$labels['changepasswd'] = 'Promijeni zaporku';
+$labels['curpasswd'] = 'Va鱉e��a zaporka:';
+$labels['newpasswd'] = 'Nova zaporka:';
+$labels['confpasswd'] = 'Potvrda nove zaporke:';
+$labels['nopassword'] = 'Molimo unesite novu zaporku.';
+$labels['nocurpassword'] = 'Molimo unesite trenutnu zaporku.';
+$labels['passwordincorrect'] = 'Trenutna zaporka je neva鱉e��a.';
+$labels['passwordinconsistency'] = 'Zaporke su razli��ite, poku禳ajte ponovo.';
+$labels['crypterror'] = 'Nemogu��e promijeniti zaporku. Nedostaje enkripcijska funkcija.';
+$labels['connecterror'] = 'Nemogu��e promijeniti zaporku. Gre禳ka prilikom spajanja.';
+$labels['internalerror'] = 'Nemogu��e promijeniti zaporku.';
+$labels['passwordshort'] = 'Zaporka mora sadr鱉avati barem $length znakova.';
+$labels['passwordweak'] = 'Zaporka mora sadr鱉avati barem jedanu znamenku i jedan interpunkcijski znak.';
+$labels['passwordforbidden'] = 'Zaporka sadr鱉i nedozvoljene znakove.';
 
-?>
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
index c8c3015a1..3fb9a93d6 100644
--- a/plugins/password/localization/hu_HU.inc
+++ b/plugins/password/localization/hu_HU.inc
@@ -1,17 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Jelsz籀v獺lt獺s';
-$labels['curpasswd']  = 'Jelenlegi jelsz籀:';
-$labels['newpasswd']  = '��j jelsz籀:';
-$labels['confpasswd']  = '��j jelsz籀 m矇gegyszer:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: bela                                                          |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'K矇rj羹k adja meg az 繳j jelsz籀t.';
-$messages['nocurpassword'] = 'K矇rj羹k adja meg a jelenlegi jelsz籀t.';
-$messages['passwordincorrect'] = '��rv矇nytelen a jelenlegi jelsz籀.';
-$messages['passwordinconsistency'] = 'A k矇t 繳j jelsz籀 nem egyezik.';
-$messages['crypterror'] = 'Hiba t繹rt矇nt a k矇r矇s feldolgoz獺sa sor獺n.';
-$messages['internalerror'] = 'Hiba t繹rt矇nt a k矇r矇s feldolgoz獺sa sor獺n.';
+$labels = array();
+$labels['changepasswd'] = 'Jelsz籀 m籀dos穩t獺s';
+$labels['curpasswd'] = 'Jelenlegi jelsz籀:';
+$labels['newpasswd'] = '��j jelsz籀:';
+$labels['confpasswd'] = '��j jelsz籀 m矇gegyszer:';
+$labels['nopassword'] = 'K矇rj羹k adja meg az 繳j jelsz籀t.';
+$labels['nocurpassword'] = 'K矇rj羹k adja meg a jelenlegi jelsz籀t.';
+$labels['passwordincorrect'] = '��rv矇nytelen a jelenlegi jelsz籀.';
+$labels['passwordinconsistency'] = 'A be穩rt jelszavak nem azonosak. Pr籀b獺lja 繳jra.';
+$labels['crypterror'] = 'Hiba t繹rt矇nt a k矇r矇s feldolgoz獺sa sor獺n.';
+$labels['connecterror'] = 'Az 繳j jelsz籀 ment矇se nem siker羹lt. Hiba a kapcsolatban';
+$labels['internalerror'] = 'Hiba t繹rt矇nt a k矇r矇s feldolgoz獺sa sor獺n.';
+$labels['passwordshort'] = 'A jelsz籀nak legal獺bb $length karakter hosszunak kell lennie.';
+$labels['passwordweak'] = 'A jelsz籀nak mindenk矇ppen kell tartalmaznia egy sz獺mot 矇s egy 穩r獺sjelet.';
+$labels['passwordforbidden'] = 'A jelsz籀 tiltott karaktert is tartalmaz.';
 
-?>
diff --git a/plugins/password/localization/hy_AM.inc b/plugins/password/localization/hy_AM.inc
new file mode 100644
index 000000000..7d6ea3df7
--- /dev/null
+++ b/plugins/password/localization/hy_AM.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '堀捸梐梲梮捸掅捸梩晛 ��楖��楖晜楖��桭';
+$labels['curpasswd'] = '埜梩朘捸 掁捸梐梲梮捸掅捸梩旍`';
+$labels['newpasswd'] = '��楖�� 掁捸梐梲梮捸掅捸梩旍`';
+$labels['confpasswd'] = '埥��朘梮掍�� 梮楖�� 掁捸梐梲梮捸掅捸梩旍`';
+$labels['nopassword'] = '��掍��桭楖����掍�� 梮楖�� 掁捸梐梲梮捸掅捸梩旍��';
+$labels['nocurpassword'] = '��掍��桭楖����掍�� 捸梩朘捸 掁捸梐梲梮捸掅捸梩旍��';
+$labels['passwordincorrect'] = '埜梩朘捸 掁捸梐梲梮捸掅捸梩旍 桵晜捸晙 敓��';
+$labels['passwordinconsistency'] = '��楖�� 掁捸梐梲梮捸掅捸梩掍��旍 桯掍梮 桹捸桭旍梮朘梮楖��桭, 朘��朘晛梮 ��楖��梇掍����';
+$labels['crypterror'] = '��楖�� 掁捸梐梲梮捸掅捸梩晛 梣捸桹梣捸梮楖��桭旍 梇捸晜楖梐桴掍���� 埴捸��捸朘捸桮楖��桭 敓 掁捸梐梲梮捸掁��桭捸梮 ��楖��梮朘��晛捸梮��';
+$labels['connecterror'] = '��楖�� 掁捸梐梲梮捸掅捸梩晛 梣捸桹梣捸梮楖��桭旍 梇捸晜楖梐桴掍���� 埥捸梣晛 桵晜捸晙��';
+$labels['internalerror'] = '��楖�� 掁捸梐梲梮捸掅捸梩晛 梣捸桹梣捸梮楖��桭旍 梇捸晜楖梐桴掍����';
+$labels['passwordshort'] = '堀捸梐梲梮捸掅捸梩掍��旍 梣掍梲�� 敓 晙晛梮掍梮 捸梩梮桴捸捰梮 $length 梮晛梫 掍��朘捸��楖��晥桮捸桭掅��';
+$labels['passwordweak'] = '堀捸梐梲梮捸掅捸梩掍��旍 梣掍梲�� 敓 梣捸��楖��梮捸朘掍梮 捸梩梮桴捸捰梮 桭掍朘 晥晛桴 �� 桭掍朘 朘掍梲捸掑��捸朘捸梮 梮晛梫��';
+$labels['passwordforbidden'] = '堀捸梐梲梮捸掅捸梩旍 梣捸��楖��梮捸朘楖��桭 敓 捸��掁掍晙桴捸晢 梮晛梫��';
+
diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc
index 47cac0430..32377f01f 100644
--- a/plugins/password/localization/ja_JP.inc
+++ b/plugins/password/localization/ja_JP.inc
@@ -1,23 +1,31 @@
 <?php
 
-//  EN-Revision: 3891
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Takahiro Kambe                                                |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['changepasswd']  = '�����嫘�胯�潦����桀�����';
-$labels['curpasswd']  = '��曉�具�柴����嫘�胯�潦��:';
-$labels['newpasswd']  = '��啜����������嫘�胯�潦��:';
-$labels['confpasswd']  = '��啜����������嫘�胯�潦�� (蝣箄��):';
+$labels['changepasswd'] = '�����嫘�胯�潦����桀�����';
+$labels['curpasswd'] = '��曉�具�柴����嫘�胯�潦��:';
+$labels['newpasswd'] = '��啜����������嫘�胯�潦��:';
+$labels['confpasswd'] = '��啜����������嫘�胯�潦�� (蝣箄��):';
+$labels['nopassword'] = '��啜����������嫘�胯�潦�������亙�������艾��������������';
+$labels['nocurpassword'] = '��曉�具�柴����嫘�胯�潦�������亙�������艾��������������';
+$labels['passwordincorrect'] = '��曉�具�柴����嫘�胯�潦����������������艾����整�����';
+$labels['passwordinconsistency'] = '�����嫘�胯�潦�����銝���氬����整��������������銝�摨艾�������氬����艾��������������';
+$labels['crypterror'] = '�����嫘�胯�潦�����靽�摮���扼����整�������扼�������������瑕����Ｘ�啜����踴����������整��������';
+$labels['connecterror'] = '��啜����������嫘�胯�潦�����靽�摮���扼����整�������扼����������亦����具�押�潦�扼�����';
+$labels['internalerror'] = '��啜����������嫘�胯�潦�����靽�摮���扼����整�������扼��������';
+$labels['passwordshort'] = '�����嫘�胯�潦����臬����芥����具�� $length ���摮���桅�瑯�����敹�閬���扼�����';
+$labels['passwordweak'] = '�����嫘�胯�潦����臬����芥����具����啣����� 1 ���摮���刻����瑯�� 1 ���摮������怒����扼����芥�������啜�芥����整��������';
+$labels['passwordforbidden'] = '�����嫘�胯�潦����怎��甇Ｕ�����������摮������怒�整����艾����整�����';
 
-$messages = array();
-$messages['nopassword'] = '��啜����������嫘�胯�潦�������亙�������艾��������������';
-$messages['nocurpassword'] = '��曉�具�柴����嫘�胯�潦�������亙�������艾��������������';
-$messages['passwordincorrect'] = '��曉�具�柴����嫘�胯�潦����������������艾����整�����';
-$messages['passwordinconsistency'] = '�����嫘�胯�潦�����銝���氬����整��������������銝�摨艾�������氬����艾��������������';
-$messages['crypterror'] = '�����嫘�胯�潦�����靽�摮���扼����整�������扼�������������瑕����Ｘ�啜����踴����������整��������';
-$messages['connecterror'] = '��啜����������嫘�胯�潦�����靽�摮���扼����整�������扼����������亦����具�押�潦�扼�����';
-$messages['internalerror'] = '��啜����������嫘�胯�潦�����靽�摮���扼����整�������扼��������';
-$messages['passwordshort'] = '�����嫘�胯�潦����臬����芥����具�� $length ���摮���桅�瑯�����敹�閬���扼�����';
-$messages['passwordweak'] = '�����嫘�胯�潦����臬����芥����具����啣����� 1 ���摮���刻����瑯�� 1 ���摮���怒����扼�芥�������啜�芥����整��������';
-$messages['passwordforbidden'] = '�����嫘�胯�潦����怎��甇Ｕ�����������摮������怒�整����艾����整�����';
-
-?>
diff --git a/plugins/password/localization/ko_KR.inc b/plugins/password/localization/ko_KR.inc
new file mode 100644
index 000000000..9bbe4cc79
--- /dev/null
+++ b/plugins/password/localization/ko_KR.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '������ 貐�窶�';
+$labels['curpasswd'] = '������ ������:';
+$labels['newpasswd'] = '��� ������:';
+$labels['confpasswd'] = '���諢���� 赬�諻�貒���� ������ :';
+$labels['nopassword'] = '��� �����賈未 �����伕��������.';
+$labels['nocurpassword'] = '������ ��科�拖����� �����賈未 �����伕����賄��.';
+$labels['passwordincorrect'] = '������ ��科�拖����� �����資�� ��禺��諝渥�� �����蛟�����.';
+$labels['passwordinconsistency'] = '�����資�� ��潰�����鴔� �����蛟�����. ��木�� ���������篣� 諻����������.';
+$labels['crypterror'] = '���諢���� �����賈未 �����伕�� ��� �����蛟�����. �����貲�� ��欠��.';
+$labels['connecterror'] = '���諢���� �����賈未 �����伕�� ��� �����蛟�����. ��國盒 ��月��.';
+$labels['internalerror'] = '���諢���� �����賈未 �����伕�� ��� �����蛟�����.';
+$labels['passwordshort'] = '�����賈�� �����渠�� $length 篣���� ��渥����渥�渥�� ��拘�����.';
+$labels['passwordweak'] = '�����賈�� �����渠�� ��恢�� ��������� ��寢�� 諡賄�� ������諝� ��秒�刮����科�� ��拘�����.';
+$labels['passwordforbidden'] = '�����資�� �����趟��鴔� ������ 諡賄����木�� ��秒�刮��窸� �����蛟�����.';
+
diff --git a/plugins/password/localization/lt_LT.inc b/plugins/password/localization/lt_LT.inc
index b4563cc42..86e7a3db0 100644
--- a/plugins/password/localization/lt_LT.inc
+++ b/plugins/password/localization/lt_LT.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Slapta鱉od鱉io keitimas';
-$labels['curpasswd']  = 'Dabartinis slapta鱉odis:';
-$labels['newpasswd']  = 'Naujasis slapta鱉odis:';
-$labels['confpasswd']  = 'Pakartokite nauj��j蠕 slapta鱉od蠕:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Rimas Kudelis <rq@akl.lt>                                     |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Pra禳om 蠕vesti nauj��j蠕 slapta鱉od蠕.';
-$messages['nocurpassword'] = 'Pra禳om 蠕vesti dabartin蠕 slapta鱉od蠕.';
-$messages['passwordincorrect'] = 'Dabartinis slapta鱉odis neteisingas.';
-$messages['passwordinconsistency'] = 'Slapta鱉od鱉iai nesutapo. Bandykite dar kart��.';
-$messages['crypterror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io. Tr贖ksta 禳ifravimo funkcijos.';
-$messages['connecterror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io. Prisijungimo klaida.';
-$messages['internalerror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io.';
-$messages['passwordshort'] = 'Slapta鱉odis turi b贖ti sudarytas i禳 bent $length simboli鑒.';
-$messages['passwordweak'] = 'Slapta鱉odyje turi b贖ti bent vienas skaitmuo ir vienas skyrybos 鱉enklas.';
-$messages['passwordforbidden'] = 'Slapta鱉odyje rasta neleistin鑒 simboli鑒.';
+$labels = array();
+$labels['changepasswd'] = 'Slapta鱉od鱉io keitimas';
+$labels['curpasswd'] = 'Dabartinis slapta鱉odis:';
+$labels['newpasswd'] = 'Naujasis slapta鱉odis:';
+$labels['confpasswd'] = 'Pakartokite nauj��j蠕 slapta鱉od蠕:';
+$labels['nopassword'] = 'Pra禳om 蠕vesti nauj��j蠕 slapta鱉od蠕.';
+$labels['nocurpassword'] = 'Pra禳om 蠕vesti dabartin蠕 slapta鱉od蠕.';
+$labels['passwordincorrect'] = 'Dabartinis slapta鱉odis neteisingas.';
+$labels['passwordinconsistency'] = 'Slapta鱉od鱉iai nesutapo. Bandykite dar kart��.';
+$labels['crypterror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io. Tr贖ksta 禳ifravimo funkcijos.';
+$labels['connecterror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io. Ry禳io klaida.';
+$labels['internalerror'] = 'Nepavyko 蠕ra禳yti naujojo slapta鱉od鱉io.';
+$labels['passwordshort'] = 'Slapta鱉odis turi b贖ti sudarytas bent i禳 $length simboli鑒.';
+$labels['passwordweak'] = 'Slapta鱉odyje turi b贖ti bent vienas skaitmuo ir vienas skyrybos 鱉enklas.';
+$labels['passwordforbidden'] = 'Slapta鱉odyje rasta neleistin鑒 simboli鑒.';
 
-?>
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
index 8f5f4c2c2..0dbbdba28 100644
--- a/plugins/password/localization/lv_LV.inc
+++ b/plugins/password/localization/lv_LV.inc
@@ -1,20 +1,30 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Nomain蘋t paroli';
-$labels['curpasswd']  = 'Pa禳reiz��j�� parole:';
-$labels['newpasswd']  = 'Jaun�� parole:';
-$labels['confpasswd']  = 'V��lreiz jauno paroli:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lv_LV/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'L贖dzu, ievadiet jauno paroli.';
-$messages['nocurpassword'] = 'L贖dzu, ievadiet pa禳reiz��jo paroli.';
-$messages['passwordincorrect'] = 'Pa禳reiz��j�� parole nepareiza.';
-$messages['passwordinconsistency'] = 'Paroles nesakr蘋t. L贖dzu, ievadiet v��lreiz.';
-$messages['crypterror'] = 'Nevar��ja saglab��t jauno paroli. Tr贖kst kript��禳anas funkcija.';
-$messages['connecterror'] = 'Nevar��ja saglab��t jauno paroli. Savienojuma k躁贖da.';
-$messages['internalerror'] = 'Nevar��ja saglab��t jauno paroli.';
-$messages['passwordshort'] = 'Jaunajai parolei j��b贖t vismaz $length simbola garai.';
-$messages['passwordweak'] = 'Jaunajai parolei j��satur vismaz viens cipars un punktu��cijas simbols.';
+$labels = array();
+$labels['changepasswd'] = 'Nomain蘋t paroli';
+$labels['curpasswd'] = 'Pa禳reiz��j�� parole:';
+$labels['newpasswd'] = 'Jaun�� parole:';
+$labels['confpasswd'] = 'V��lreiz jauno paroli:';
+$labels['nopassword'] = 'L贖dzu, ievadiet jauno paroli.';
+$labels['nocurpassword'] = 'L贖dzu, ievadiet pa禳reiz��jo paroli.';
+$labels['passwordincorrect'] = 'Pa禳reiz��j�� parole nepareiza.';
+$labels['passwordinconsistency'] = 'Paroles nesakr蘋t. L贖dzu, ievadiet v��lreiz.';
+$labels['crypterror'] = 'Nevar��ja saglab��t jauno paroli. Tr贖kst kript��禳anas funkcija.';
+$labels['connecterror'] = 'Nevar��ja saglab��t jauno paroli. Savienojuma k躁贖da.';
+$labels['internalerror'] = 'Nevar��ja saglab��t jauno paroli.';
+$labels['passwordshort'] = 'Jaunajai parolei j��b贖t vismaz $length simbola garai.';
+$labels['passwordweak'] = 'Jaunajai parolei j��satur vismaz viens cipars un punktu��cijas simbols.';
 
-?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index 6d7c401ac..5429cb52e 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -1,17 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Wijzig Wachtwoord';
-$labels['curpasswd']  = 'Huidig Wachtwoord:';
-$labels['newpasswd']  = 'Nieuw Wachtwoord:';
-$labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken                                                  |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Vul een wachtwoord in.';
-$messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
-$messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
-$messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
-$messages['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
-$messages['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
+$labels = array();
+$labels['changepasswd'] = 'Wijzig Wachtwoord';
+$labels['curpasswd'] = 'Huidig Wachtwoord:';
+$labels['newpasswd'] = 'Nieuw Wachtwoord:';
+$labels['confpasswd'] = 'Bevestig Nieuw Wachtwoord:';
+$labels['nopassword'] = 'Vul een wachtwoord in.';
+$labels['nocurpassword'] = 'vul het huidige wachtwoord in.';
+$labels['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
+$labels['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
+$labels['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
+$labels['connecterror'] = 'Kan het nieuwe wachtwoord niet opslaan. Verbindingsfout.';
+$labels['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
+$labels['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
+$labels['passwordweak'] = 'Het wachtwoord moet minimaal 矇矇n nummer en 矇矇n leesteken bevatten.';
+$labels['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
 
-?>
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
index 687ca9383..6edbf3fb1 100644
--- a/plugins/password/localization/pl_PL.inc
+++ b/plugins/password/localization/pl_PL.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Zmiana has��a';
-$labels['curpasswd']  = 'Aktualne has��o:';
-$labels['newpasswd']  = 'Nowe has��o:';
-$labels['confpasswd']  = 'Potwierd驕 has��o:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Wprowad驕 nowe has��o.';
-$messages['nocurpassword'] = 'Wprowad驕 aktualne has��o.';
-$messages['passwordincorrect'] = 'B����dne aktualne has��o, spr籀buj ponownie.';
-$messages['passwordinconsistency'] = 'Has��a nie pasuj��, spr籀buj ponownie.';
-$messages['crypterror'] = 'Nie uda��o si�� zapisa�� nowego has��a. Brak funkcji koduj��cej.';
-$messages['connecterror'] = 'Nie uda��o si�� zapisa�� nowego has��a. B����d po����czenia.';
-$messages['internalerror'] = 'Nie uda��o si�� zapisa�� nowego has��a.';
-$messages['passwordshort'] = 'Has��o musi posiada�� co najmniej $length znak籀w.';
-$messages['passwordweak'] = 'Has��o musi zawiera�� co najmniej jedn�� cyfr�� i znak interpunkcyjny.';
-$messages['passwordforbidden'] = 'Has��o zawiera niedozwolone znaki.';
+$labels = array();
+$labels['changepasswd'] = 'Zmiana has��a';
+$labels['curpasswd'] = 'Aktualne has��o:';
+$labels['newpasswd'] = 'Nowe has��o:';
+$labels['confpasswd'] = 'Potwierd驕 has��o:';
+$labels['nopassword'] = 'Wprowad驕 nowe has��o.';
+$labels['nocurpassword'] = 'Wprowad驕 aktualne has��o.';
+$labels['passwordincorrect'] = 'B����dne aktualne has��o, spr籀buj ponownie.';
+$labels['passwordinconsistency'] = 'Has��a nie pasuj��, spr籀buj ponownie.';
+$labels['crypterror'] = 'Nie uda��o si�� zapisa�� nowego has��a. Brak funkcji koduj��cej.';
+$labels['connecterror'] = 'Nie uda��o si�� zapisa�� nowego has��a. B����d po����czenia.';
+$labels['internalerror'] = 'Nie uda��o si�� zapisa�� nowego has��a.';
+$labels['passwordshort'] = 'Has��o musi posiada�� co najmniej $length znak籀w.';
+$labels['passwordweak'] = 'Has��o musi zawiera�� co najmniej jedn�� cyfr�� i znak interpunkcyjny.';
+$labels['passwordforbidden'] = 'Has��o zawiera niedozwolone znaki.';
 
-?>
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
index f3626e834..cd6b19902 100644
--- a/plugins/password/localization/pt_BR.inc
+++ b/plugins/password/localization/pt_BR.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Alterar senha';
-$labels['curpasswd']  = 'Senha atual:';
-$labels['newpasswd']  = 'Nova senha:';
-$labels['confpasswd']  = 'Confirmar nova senha:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Por favor, informe a nova senha.';
-$messages['nocurpassword'] = 'Por favor, informe a senha atual.';
-$messages['passwordincorrect'] = 'Senha atual incorreta.';
-$messages['passwordinconsistency'] = 'Senhas n瓊o combinam, por favor tente novamente.';
-$messages['crypterror'] = 'N瓊o foi poss穩vel gravar a nova senha. Fun癟瓊o de criptografia ausente.';
-$messages['connecterror'] = 'N瓊o foi poss穩vel gravar a nova senha. Erro de conex瓊o.';
-$messages['internalerror'] = 'N瓊o foi poss穩vel gravar a nova senha.';
-$messages['passwordshort'] = 'A senha precisa ter ao menos $length caracteres.';
-$messages['passwordweak'] = 'A senha precisa conter ao menos um n繳mero e um caractere de pontua癟瓊o.';
-$messages['passwordforbidden'] = 'A senha cont矇m caracteres proibidos.';
+$labels = array();
+$labels['changepasswd'] = 'Alterar senha';
+$labels['curpasswd'] = 'Senha atual:';
+$labels['newpasswd'] = 'Nova senha:';
+$labels['confpasswd'] = 'Confirmar nova senha:';
+$labels['nopassword'] = 'Por favor, informe a nova senha.';
+$labels['nocurpassword'] = 'Por favor, informe a senha atual.';
+$labels['passwordincorrect'] = 'Senha atual incorreta.';
+$labels['passwordinconsistency'] = 'Senhas n瓊o combinam, por favor tente novamente.';
+$labels['crypterror'] = 'N瓊o foi poss穩vel gravar a nova senha. Fun癟瓊o de criptografia ausente.';
+$labels['connecterror'] = 'N瓊o foi poss穩vel gravar a nova senha. Erro de conex瓊o.';
+$labels['internalerror'] = 'N瓊o foi poss穩vel gravar a nova senha.';
+$labels['passwordshort'] = 'A senha precisa ter ao menos $length caracteres.';
+$labels['passwordweak'] = 'A senha precisa conter ao menos um n繳mero e um caractere de pontua癟瓊o.';
+$labels['passwordforbidden'] = 'A senha cont矇m caracteres proibidos.';
 
-?>
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
index 5307ad69f..004e9b207 100644
--- a/plugins/password/localization/pt_PT.inc
+++ b/plugins/password/localization/pt_PT.inc
@@ -1,18 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Alterar password';
-$labels['curpasswd']  = 'Password atual:';
-$labels['newpasswd']  = 'Nova password:';
-$labels['confpasswd']  = 'Confirmar password:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David                                                         |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Introduza a nova password.';
-$messages['nocurpassword'] = 'Introduza a password actual.';
-$messages['passwordincorrect'] = 'Password actual errada.';
-$messages['passwordinconsistency'] = 'Password\'s n瓊o combinam, tente novamente..';
-$messages['crypterror'] = 'N瓊o foi poss穩vel gravar a nova password. Fun癟瓊o de criptografica inexistente.';
-$messages['connecterror'] = 'N瓊o foi poss穩vel gravar a nova password. Erro de liga癟瓊o.';
-$messages['internalerror'] = 'N瓊o foi poss穩vel gravar a nova password.';
+$labels = array();
+$labels['changepasswd'] = 'Alterar password';
+$labels['curpasswd'] = 'Password atual:';
+$labels['newpasswd'] = 'Nova password:';
+$labels['confpasswd'] = 'Confirmar password:';
+$labels['nopassword'] = 'Introduza a nova password.';
+$labels['nocurpassword'] = 'Introduza a password actual.';
+$labels['passwordincorrect'] = 'Password actual errada.';
+$labels['passwordinconsistency'] = 'Password\'s n瓊o combinam, tente novamente..';
+$labels['crypterror'] = 'N瓊o foi poss穩vel gravar a nova password. Fun癟瓊o de criptografica inexistente.';
+$labels['connecterror'] = 'N瓊o foi poss穩vel gravar a nova password. Erro de liga癟瓊o.';
+$labels['internalerror'] = 'N瓊o foi poss穩vel gravar a nova password.';
+$labels['passwordshort'] = 'A palavra-passe deve ter pelo menos $length caracteres';
+$labels['passwordweak'] = 'A palavra-passe deve incluir pelo menos um numero e um sinal de pontua癟瓊o.';
+$labels['passwordforbidden'] = 'A palavra-passe cont矇m caracteres n瓊o suportados.';
 
-?>
diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc
index 3776b4598..e21f82020 100644
--- a/plugins/password/localization/ru_RU.inc
+++ b/plugins/password/localization/ru_RU.inc
@@ -1,35 +1,31 @@
 <?php
-/*
-
-+-----------------------------------------------------------------------+
-| plugins/password/localization/ru_RU.inc                               |
-|                                                                       |
-| Language file of the Roundcube help plugin                            |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Sergey Dukachev <iam@dukess.ru>                               |
-+-----------------------------------------------------------------------+
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['changepasswd']  = '��郱邾迮郇邽���� 郈訄��郋郅��';
-$labels['curpasswd']  = '苠迮郕����邽邿 郈訄��郋郅��:';
-$labels['newpasswd']  = '��郋赲��邿 郈訄��郋郅��:';
-$labels['confpasswd']  = '��郋迡��赲迮��迡邽��迮 郇郋赲��邿 郈訄��郋郅��:';
-
-$messages = array();
-$messages['nopassword'] = '��郋迠訄郅��邿����訄, 赲赲迮迡邽��迮 郇郋赲��邿 郈訄��郋郅��.';
-$messages['nocurpassword'] = '��郋迠訄郅��邿����訄, 赲赲迮迡邽��迮 ��迮郕����邽邿 郈訄��郋郅��.';
-$messages['passwordincorrect'] = '苠迮郕����邽邿 郈訄��郋郅�� 郇迮赲迮��迮郇.';
-$messages['passwordinconsistency'] = '��訄��郋郅邽 郇迮 ��郋赲郈訄迡訄����, 郈郋郈��郋訇��邿��迮, 郈郋迠訄郅��邿����訄, 迮����.';
-$messages['crypterror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��. ��������������赲��迮�� 郕��邽郈��郋迣��訄��邽��迮��郕訄�� ����郇郕��邽��.';
-$messages['connecterror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��. ����邽訇郕訄 ��郋迮迡邽郇迮郇邽��.';
-$messages['internalerror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��.';
-$messages['passwordshort'] = '��訄��郋郅�� 迡郋郅迠迮郇 訇������ 迡郅邽郇郋邿 郕訄郕 邾邽郇邽邾��邾 $length ��邽邾赲郋郅郋赲.';
-$messages['passwordweak'] = '��訄��郋郅�� 迡郋郅迠迮郇 赲郕郅����訄���� 赲 ��迮訇�� 郕訄郕 邾邽郇邽邾��邾 郋迡郇�� ��邽������ 邽 郋迡邽郇 郱郇訄郕 郈��郇郕����訄��邽邽.';
-$messages['passwordforbidden'] = '��訄��郋郅�� ��郋迡迮��迠邽�� 郇迮迡郋郈������邽邾��迮 ��邽邾赲郋郅��.';
+$labels['changepasswd'] = '��郱邾迮郇邽���� 郈訄��郋郅��';
+$labels['curpasswd'] = '苠迮郕����邽邿 郈訄��郋郅��:';
+$labels['newpasswd'] = '��郋赲��邿 郈訄��郋郅��:';
+$labels['confpasswd'] = '��郋迡��赲迮��迡邽��迮 郇郋赲��邿 郈訄��郋郅��:';
+$labels['nopassword'] = '��郋迠訄郅��邿����訄, 赲赲迮迡邽��迮 郇郋赲��邿 郈訄��郋郅��.';
+$labels['nocurpassword'] = '��郋迠訄郅��邿����訄, 赲赲迮迡邽��迮 ��迮郕����邽邿 郈訄��郋郅��.';
+$labels['passwordincorrect'] = '苠迮郕����邽邿 郈訄��郋郅�� 郇迮赲迮��迮郇.';
+$labels['passwordinconsistency'] = '��訄��郋郅邽 郇迮 ��郋赲郈訄迡訄����, 郈郋郈��郋訇��邿��迮, 郈郋迠訄郅��邿����訄, 迮����.';
+$labels['crypterror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��. ��������������赲��迮�� 郕��邽郈��郋迣��訄��邽��迮��郕訄�� ����郇郕��邽��.';
+$labels['connecterror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��. ����邽訇郕訄 ��郋迮迡邽郇迮郇邽��.';
+$labels['internalerror'] = '��迮 邾郋迣�� ��郋����訄郇邽���� 郇郋赲��邿 郈訄��郋郅��.';
+$labels['passwordshort'] = '��訄��郋郅�� 迡郋郅迠迮郇 訇������ 迡郅邽郇郋邿 郕訄郕 邾邽郇邽邾��邾 $length ��邽邾赲郋郅郋赲.';
+$labels['passwordweak'] = '��訄��郋郅�� 迡郋郅迠迮郇 赲郕郅����訄���� 赲 ��迮訇�� 郕訄郕 邾邽郇邽邾��邾 郋迡郇�� ��邽������ 邽 郋迡邽郇 郱郇訄郕 郈��郇郕����訄��邽邽.';
+$labels['passwordforbidden'] = '��訄��郋郅�� ��郋迡迮��迠邽�� 郇迮迡郋郈������邽邾��迮 ��邽邾赲郋郅��.';
 
-?>
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index 6def2f914..9767cb443 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -1,29 +1,31 @@
 <?php
 
-/**
- * Slovak translation for Roundcube password plugin
- *
- * @version 1.0 (2010-10-18)
- * @author panda <admin@whistler.sk>
- *
- */
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['changepasswd']  = 'Zmeni聽 heslo';
-$labels['curpasswd']  = 'S繳��asn矇 heslo:';
-$labels['newpasswd']  = 'Nov矇 heslo:';
-$labels['confpasswd']  = 'Potvr�� nov矇 heslo:';
+$labels['changepasswd'] = 'Zmeni聽 heslo';
+$labels['curpasswd'] = 'S繳��asn矇 heslo:';
+$labels['newpasswd'] = 'Nov矇 heslo:';
+$labels['confpasswd'] = 'Potvr�� nov矇 heslo:';
+$labels['nopassword'] = 'Pros穩m zadaj nov矇 heslo.';
+$labels['nocurpassword'] = 'Pros穩m zadaj s繳��asn矇 heslo.';
+$labels['passwordincorrect'] = 'S繳��asn矇 heslo je nespr獺vne.';
+$labels['passwordinconsistency'] = 'Hesl獺 nie s繳 rovnak矇, sk繳s znova.';
+$labels['crypterror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo. Ch羸ba 禳ifrovacia funkcia.';
+$labels['connecterror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo. Chyba spojenia.';
+$labels['internalerror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo.';
+$labels['passwordshort'] = 'Heslo mus穩 ma聽 najmenej $length znakov.';
+$labels['passwordweak'] = 'Heslo mus穩 obsahova聽 aspo�� jedno ��穩slo a jedno interpunk��n矇 znamienko.';
+$labels['passwordforbidden'] = 'Heslo obsahuje nepovolen矇 znaky.';
 
-$messages = array();
-$messages['nopassword'] = 'Pros穩m zadaj nov矇 heslo.';
-$messages['nocurpassword'] = 'Pros穩m zadaj s繳��asn矇 heslo.';
-$messages['passwordincorrect'] = 'S繳��asn矇 heslo je nespr獺vne.';
-$messages['passwordinconsistency'] = 'Hesl獺 nie s繳 rovnak矇, sk繳s znova.';
-$messages['crypterror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo. Ch羸ba 禳ifrovacia funkcia.';
-$messages['connecterror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo. Chyba spojenia.';
-$messages['internalerror'] = 'Nem繫鱉em ulo鱉i聽 nov矇 heslo.';
-$messages['passwordshort'] = 'Heslo mus穩 ma聽 najmenej $length znakov.';
-$messages['passwordweak'] = 'Heslo mus穩 obsahova聽 aspo�� jedno ��穩slo a jedno interpunk��n矇 znamienko.';
-$messages['passwordforbidden'] = 'Heslo obsahuje nepovolen矇 znaky.';
-
-?>
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index df17583be..30525415f 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -1,18 +1,31 @@
 <?php
-	
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Barbara Krasovec <barbarak@arnes.si>                          |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['changepasswd']  = 'Spremeni geslo';
-$labels['curpasswd']  = 'Obstoje��e geslo:';
-$labels['newpasswd']  = 'Novo geslo:';
-$labels['confpasswd']  = 'Potrdi novo geslo:';
-	
-$messages = array();
-$messages['nopassword'] = 'Vnesite novo geslo.';
-$messages['nocurpassword'] = 'Vnesite obstoje��e geslo.';
-$messages['passwordincorrect'] = 'Obstoje��e geslo ni veljavno.';
-$messages['passwordinconsistency'] = 'Gesli se ne ujemata, poskusite znova.';
-$messages['crypterror'] = 'Novega gesla ni bilo mogo��e shraniti. Pri禳lo je do napake pri 禳ifriranju.';
-$messages['connecterror'] = 'Novega gesla ni bilo mogo��e shraniti. Pri禳lo je do napake v povezavi.';
-$messages['internalerror'] = 'Novega gesla ni bilo mogo��e shraniti.';
+$labels['changepasswd'] = 'Spremeni geslo';
+$labels['curpasswd'] = 'Obstoje��e geslo:';
+$labels['newpasswd'] = 'Novo geslo:';
+$labels['confpasswd'] = 'Potrdi novo geslo:';
+$labels['nopassword'] = 'Vnesite novo geslo.';
+$labels['nocurpassword'] = 'Vnesite obstoje��e geslo.';
+$labels['passwordincorrect'] = 'Obstoje��e geslo ni veljavno.';
+$labels['passwordinconsistency'] = 'Gesli se ne ujemata, poskusite znova.';
+$labels['crypterror'] = 'Novega gesla ni bilo mogo��e shraniti. Pri禳lo je do napake pri 禳ifriranju.';
+$labels['connecterror'] = 'Novega gesla ni bilo mogo��e shraniti. Pri禳lo je do napake v povezavi.';
+$labels['internalerror'] = 'Novega gesla ni bilo mogo��e shraniti.';
+$labels['passwordshort'] = 'Geslo mora vsebovati vsaj $length znakov';
+$labels['passwordweak'] = 'Geslo mora vklju��evati vsaj eno 禳tevilko in lo��ilo.';
+$labels['passwordforbidden'] = 'Geslo vsebuje neveljavne znake.';
 
-?>
diff --git a/plugins/password/localization/sr_CS.inc b/plugins/password/localization/sr_CS.inc
new file mode 100644
index 000000000..4224f492f
--- /dev/null
+++ b/plugins/password/localization/sr_CS.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '����郋邾邽��迮郇邽 郅郋郱邽郇郕��';
+$labels['curpasswd'] = '苠��迮郇����郇訄 郅郋郱邽郇郕訄:';
+$labels['newpasswd'] = '��郋赲訄 郅郋郱邽郇郕訄:';
+$labels['confpasswd'] = '��郋郇郋赲邽��迮 郅郋郱邽郇郕��:';
+$labels['nopassword'] = '��郋郅邽邾郋 ��郇迮��邽��迮 郇郋赲�� 郅郋郱邽郇郕��.';
+$labels['nocurpassword'] = '��郋郅邽邾郋 ��郇迮��邽��迮 ����迮郇����郇�� 郅郋郱邽郇郕��.';
+$labels['passwordincorrect'] = '苠��迮郇����郇訄 郅郋郱邽郇郕訄 ��迮 郇迮��訄��郇訄.';
+$labels['passwordinconsistency'] = '��郋郱邽郇郕迮 ��迮 郇迮 郈郋郕郅訄郈訄����, 邾郋郅邽邾郋 郈郋郕����訄����迮 郈郋郇郋赲郋.';
+$labels['crypterror'] = '��邽��迮 邾郋迣����迮 ��訄����赲訄��邽 郇郋赲�� 郅郋郱邽郇郕��. ��迮迡郋����訄��迮 ����郇郕��邽��訄 郱訄 郕郋迡邽��訄��迮.';
+$labels['connecterror'] = '��邽��迮 邾郋迣����迮 ��訄����赲訄��邽 郇郋赲�� 郅郋郱邽郇郕��. ����迮��郕訄 �� ��迮郱邽.';
+$labels['internalerror'] = '��邽��迮 邾郋迣����迮 ��訄����赲訄��邽 郇郋赲�� 郅郋郱邽郇郕��.';
+$labels['passwordshort'] = '��郋郱邽郇郕訄 邾郋��訄 邽邾訄��邽 郇訄��邾訄��迮 $lenght 郱郇訄郕郋赲訄.';
+$labels['passwordweak'] = '��郋郱邽郇郕訄 邾郋��訄 迡訄 ��訄迡��迠邽 郇訄��邾訄��迮 ��迮迡訄郇 訇��郋�� 邽 ��迮迡訄郇 邽郇��迮��郈��郇郕��邽����郕邽 郱郇訄郕.';
+$labels['passwordforbidden'] = '��郋郱邽郇郕訄 ��訄迡��迠邽 郇迮迡郋郱赲郋��迮郇迮 郱郇訄郕郋赲迮.';
+
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
index d649bbd9a..67e71a424 100644
--- a/plugins/password/localization/sv_SE.inc
+++ b/plugins/password/localization/sv_SE.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = '��ndra l繹senord';
-$labels['curpasswd']  = 'Nuvarande l繹senord:';
-$labels['newpasswd']  = 'Nytt l繹senord:';
-$labels['confpasswd']  = 'Bekr瓣fta nytt l繹senord:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'V瓣nligen ange nytt l繹senord.';
-$messages['nocurpassword'] = 'V瓣nligen ange nuvarande l繹senord.';
-$messages['passwordincorrect'] = 'Felaktigt nuvarande l繹senord.';
-$messages['passwordinconsistency'] = 'Nya l繹senordet och bekr瓣ftelsen 繹verensst瓣mmer inte, f繹rs繹k igen.';
-$messages['crypterror'] = 'L繹senordet kunde inte 瓣ndras. Krypteringsfunktionen saknas.';
-$messages['connecterror'] = 'L繹senordet kunde inte 瓣ndras. Anslutningen misslyckades.';
-$messages['internalerror'] = 'L繹senordet kunde inte 瓣ndras.';
-$messages['passwordshort'] = 'L繹senordet m疇ste vara minst $length tecken l疇ngt.';
-$messages['passwordweak'] = 'L繹senordet m疇ste inneh疇lla minst en siffra och ett specialtecken.';
-$messages['passwordforbidden'] = 'L繹senordet inneh疇ller otill疇tna tecken.';
+$labels = array();
+$labels['changepasswd'] = '��ndra l繹senord';
+$labels['curpasswd'] = 'Nuvarande l繹senord:';
+$labels['newpasswd'] = 'Nytt l繹senord:';
+$labels['confpasswd'] = 'Bekr瓣fta nytt l繹senord:';
+$labels['nopassword'] = 'V瓣nligen ange nytt l繹senord.';
+$labels['nocurpassword'] = 'V瓣nligen ange nuvarande l繹senord.';
+$labels['passwordincorrect'] = 'Felaktigt nuvarande l繹senord.';
+$labels['passwordinconsistency'] = 'Nya l繹senordet och bekr瓣ftelsen 繹verensst瓣mmer inte, f繹rs繹k igen.';
+$labels['crypterror'] = 'L繹senordet kunde inte 瓣ndras. Krypteringsfunktionen saknas.';
+$labels['connecterror'] = 'L繹senordet kunde inte 瓣ndras. Anslutningen misslyckades.';
+$labels['internalerror'] = 'L繹senordet kunde inte 瓣ndras.';
+$labels['passwordshort'] = 'L繹senordet m疇ste vara minst $length tecken l疇ngt.';
+$labels['passwordweak'] = 'L繹senordet m疇ste inneh疇lla minst en siffra och ett specialtecken.';
+$labels['passwordforbidden'] = 'L繹senordet inneh疇ller otill疇tna tecken.';
 
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/tr_TR.inc b/plugins/password/localization/tr_TR.inc
index 4f2322a2e..a2c94c102 100644
--- a/plugins/password/localization/tr_TR.inc
+++ b/plugins/password/localization/tr_TR.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Parolay覺 De��i��tir';
-$labels['curpasswd']  = '��u anki Parola:';
-$labels['newpasswd']  = 'Yeni Parola:';
-$labels['confpasswd']  = 'Yeni Parolay覺 Onaylay覺n:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: G繹kdeniz Karada��                                            |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'L羹tfen yeni ��ifreyi girin.';
-$messages['nocurpassword'] = 'L羹tfen ��u anki ��ifrenizi girin.';
-$messages['passwordincorrect'] = 'Parolan覺z覺 yanl覺�� girdiniz.';
-$messages['passwordinconsistency'] = 'Girdi��iniz parolalar uyu��muyor. L羹tfen tekrar deneyin..';
-$messages['crypterror'] = 'Yeni ��ifre kaydedilemedi. Gerekli fonksiyon eksik.';
-$messages['connecterror'] = 'Yeni ��ifre kaydedilemedi. Ba��lant覺 hatas覺.';
-$messages['internalerror'] = 'Yeni ��ifre kaydedilemedi.';
-$messages['passwordshort'] = 'Parola en az $length karakterden olu��mal覺.';
-$messages['passwordweak'] = 'Parola en az bir say覺 ve bir noktalama i��areti i癟ermeli.';
-$messages['passwordforbidden'] = 'Parola uygunsuz karakter(ler) i癟eriyor.';
+$labels = array();
+$labels['changepasswd'] = 'Parolay覺 De��i��tir';
+$labels['curpasswd'] = '��imdiki Parola:';
+$labels['newpasswd'] = 'Yeni Parola:';
+$labels['confpasswd'] = 'Yeni Parolay覺 Onaylay覺n:';
+$labels['nopassword'] = 'L羹tfen yeni parolay覺 girin.';
+$labels['nocurpassword'] = 'L羹tfen ��imdiki parolay覺 girin.';
+$labels['passwordincorrect'] = '��imdiki parolay覺 yanl覺�� girdiniz.';
+$labels['passwordinconsistency'] = 'Girdi��iniz parolalar uyu��muyor. L羹tfen tekrar deneyin.';
+$labels['crypterror'] = 'Yeni parola kaydedilemedi. ��ifreleme fonksiyonu mevcut de��il.';
+$labels['connecterror'] = 'Yeni parola kaydedilemedi. Ba��lant覺 hatas覺.';
+$labels['internalerror'] = 'Yeni parola kaydedilemedi.';
+$labels['passwordshort'] = 'Parola en az $length karakterden olu��mal覺.';
+$labels['passwordweak'] = 'Parola en az bir say覺 ve bir noktalama i��areti i癟ermeli.';
+$labels['passwordforbidden'] = 'Parola uygunsuz karakter(ler) i癟eriyor.';
 
-?>
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
new file mode 100644
index 000000000..5fd266e27
--- /dev/null
+++ b/plugins/password/localization/vi_VN.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/vi_VN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hung Pham <phamhung77@gmail.com>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '��廙�i m廕負 kh廕季';
+$labels['curpasswd'] = 'M璽怗t kh璽��u hi礙怗n ta怗i:';
+$labels['newpasswd'] = 'M廕負 kh廕季 m廙�i:';
+$labels['confpasswd'] = 'Xa��c nh璽怗n m璽怗t kh璽��u mヾ��i';
+$labels['nopassword'] = 'Mヾ��i nh璽怗p m璽怗t kh璽��u mヾ��i';
+$labels['nocurpassword'] = 'Mヾ��i nh璽怗p m璽怗t kh璽��u hi礙怗n ta怗i';
+$labels['passwordincorrect'] = 'M璽怗t kh璽��u hi礙怗n thヾ��i kh繫ng ��u��ng';
+$labels['passwordinconsistency'] = 'M璽怗t kh璽��u kh繫ng khヾ��p, ha��y thが�� la怗i';
+$labels['crypterror'] = 'Kh繫ng th礙�� lがu m璽怗t kh璽��u mヾ��i. Thi礙��u chが��c n��ng ma�� ho��a';
+$labels['connecterror'] = 'Kh繫ng th礙�� lがu m璽怗t ma�� mヾ��i. L繫��i k礙��t n繫��i';
+$labels['internalerror'] = 'Kh繫ng th礙�� lがu m璽怗t kh璽��u mヾ��i';
+$labels['passwordshort'] = 'M璽怗t kh璽��u pha��i da��i i��t nh璽��t $ ky�� tが怗';
+$labels['passwordweak'] = 'M璽怗t kh璽��u pha��i chが��a i��t nh璽��t 1 con s繫�� va�� 1 ky�� tが怗 d璽��u c璽u';
+$labels['passwordforbidden'] = 'M璽怗t kh璽��u chが��a ky�� bi怗 kh繫ng hヾ怗p l礙怗';
+
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
index 7d162274a..49fa48e7f 100644
--- a/plugins/password/localization/zh_TW.inc
+++ b/plugins/password/localization/zh_TW.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = '��湔�孵��蝣�';
-$labels['curpasswd']  = '��桀�����撖�蝣�';
-$labels['newpasswd']  = '��啣��蝣�';
-$labels['confpasswd']  = '蝣箄����啣��蝣�';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = '隢�頛詨�交�啣��蝣�';
-$messages['nocurpassword'] = '隢�頛詨�亦�桀�����撖�蝣�';
-$messages['passwordincorrect'] = '��桀�����撖�蝣潮�航炊';
-$messages['passwordinconsistency'] = '撖�蝣潔����貊泵嚗�隢������啗撓���';
-$messages['crypterror'] = '��⊥����湔�啣��蝣潘����∪��撖�璈����';
-$messages['connecterror'] = '��⊥����湔�啣��蝣潘�����蝺�憭望��';
-$messages['internalerror'] = '��⊥����湔�啣��蝣�';
-$messages['passwordshort'] = '��函��撖�蝣潸�喳����� $length ���摮�������';
-$messages['passwordweak'] = '��函����啣��蝣潸�喳�������急��銝������詨�����銝����璅�暺�蝚西��';
-$messages['passwordforbidden'] = '��函��撖�蝣澆�急��蝳���典�����';
+$labels = array();
+$labels['changepasswd'] = '��湔�孵��蝣�';
+$labels['curpasswd'] = '��桀�����撖�蝣�';
+$labels['newpasswd'] = '��啣��蝣�';
+$labels['confpasswd'] = '蝣箄����啣��蝣�';
+$labels['nopassword'] = '隢�頛詨�交�啣��蝣�';
+$labels['nocurpassword'] = '隢�頛詨�亦�桀�����撖�蝣�';
+$labels['passwordincorrect'] = '��桀�����撖�蝣潮�航炊';
+$labels['passwordinconsistency'] = '撖�蝣潔����貊泵嚗�隢������啗撓���';
+$labels['crypterror'] = '��⊥����湔�啣��蝣潘����∪��撖�璈����';
+$labels['connecterror'] = '��⊥����湔�啣��蝣潘�����蝺�憭望��';
+$labels['internalerror'] = '��⊥����湔�啣��蝣�';
+$labels['passwordshort'] = '��函��撖�蝣潸�喳����� $length ���摮�������';
+$labels['passwordweak'] = '��函����啣��蝣潸�喳�������急��銝������詨�����銝����璅�暺�蝚西��';
+$labels['passwordforbidden'] = '��函��撖�蝣澆�急��蝳���典�����';
 
-?>
diff --git a/plugins/subscriptions_option/localization/bs_BA.inc b/plugins/subscriptions_option/localization/bs_BA.inc
new file mode 100644
index 000000000..3da2eaa95
--- /dev/null
+++ b/plugins/subscriptions_option/localization/bs_BA.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bs_BA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Koristi IMAP pretplate';
+
diff --git a/plugins/subscriptions_option/localization/ca_ES.inc b/plugins/subscriptions_option/localization/ca_ES.inc
new file mode 100644
index 000000000..28e67e844
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ca_ES.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ca_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Fes servir subscripcions IMAP';
+
diff --git a/plugins/subscriptions_option/localization/cs_CZ.inc b/plugins/subscriptions_option/localization/cs_CZ.inc
index 0d9c1fc73..0c4142523 100644
--- a/plugins/subscriptions_option/localization/cs_CZ.inc
+++ b/plugins/subscriptions_option/localization/cs_CZ.inc
@@ -1,23 +1,18 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube subscriptions option plugin            |
-| Copyright (C) 2005-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['useimapsubscriptions']  = 'Pou鱉穩vat odeb穩r獺n穩 IMAP slo鱉ek';
+$labels['useimapsubscriptions'] = 'Pou鱉穩vat odeb穩r獺n穩 IMAP slo鱉ek';
 
-?>
diff --git a/plugins/subscriptions_option/localization/cy_GB.inc b/plugins/subscriptions_option/localization/cy_GB.inc
new file mode 100644
index 000000000..54cc72b8b
--- /dev/null
+++ b/plugins/subscriptions_option/localization/cy_GB.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cy_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Dafydd Tomos                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Defnyddio tanysgrifiadau IMAP';
+
diff --git a/plugins/subscriptions_option/localization/da_DK.inc b/plugins/subscriptions_option/localization/da_DK.inc
new file mode 100644
index 000000000..bcefdcc23
--- /dev/null
+++ b/plugins/subscriptions_option/localization/da_DK.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/da_DK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Johannes Hessellund <osos@openeyes.dk>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Brug IMAP abonnementer';
+
diff --git a/plugins/subscriptions_option/localization/de_CH.inc b/plugins/subscriptions_option/localization/de_CH.inc
index b4affe0c8..5a3e6908e 100644
--- a/plugins/subscriptions_option/localization/de_CH.inc
+++ b/plugins/subscriptions_option/localization/de_CH.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
+$labels['useimapsubscriptions'] = 'Nur abonnierte Ordner anzeigen';
 
-?>
diff --git a/plugins/subscriptions_option/localization/de_DE.inc b/plugins/subscriptions_option/localization/de_DE.inc
index b4affe0c8..25a8d4bde 100644
--- a/plugins/subscriptions_option/localization/de_DE.inc
+++ b/plugins/subscriptions_option/localization/de_DE.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
+$labels['useimapsubscriptions'] = 'Nur abonnierte Ordner anzeigen';
 
-?>
diff --git a/plugins/subscriptions_option/localization/en_GB.inc b/plugins/subscriptions_option/localization/en_GB.inc
new file mode 100644
index 000000000..3c88be72c
--- /dev/null
+++ b/plugins/subscriptions_option/localization/en_GB.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Use IMAP Subscriptions';
+
diff --git a/plugins/subscriptions_option/localization/es_ES.inc b/plugins/subscriptions_option/localization/es_ES.inc
index ca9a42126..dfc4c2f0a 100644
--- a/plugins/subscriptions_option/localization/es_ES.inc
+++ b/plugins/subscriptions_option/localization/es_ES.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Usar suscripciones IMAP';
+$labels['useimapsubscriptions'] = 'Usar suscripciones IMAP';
 
-?>
diff --git a/plugins/subscriptions_option/localization/et_EE.inc b/plugins/subscriptions_option/localization/et_EE.inc
index 6c5f6f435..11ebacc39 100644
--- a/plugins/subscriptions_option/localization/et_EE.inc
+++ b/plugins/subscriptions_option/localization/et_EE.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Kasuta IMAP tellimusi';
+$labels['useimapsubscriptions'] = 'Kasuta IMAP tellimusi';
 
-?>
diff --git a/plugins/subscriptions_option/localization/fa_IR.inc b/plugins/subscriptions_option/localization/fa_IR.inc
new file mode 100644
index 000000000..a2cdec71d
--- /dev/null
+++ b/plugins/subscriptions_option/localization/fa_IR.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_IR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hamid <abbaszadeh.h@gmail.com>                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = '塈堻堛��塈堹�� 塈堬 媢媔����堛 IMAP';
+
diff --git a/plugins/subscriptions_option/localization/fi_FI.inc b/plugins/subscriptions_option/localization/fi_FI.inc
new file mode 100644
index 000000000..196804228
--- /dev/null
+++ b/plugins/subscriptions_option/localization/fi_FI.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Gr繹nroos                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'K瓣yt瓣 IMAP-tilauksia';
+
diff --git a/plugins/subscriptions_option/localization/fr_FR.inc b/plugins/subscriptions_option/localization/fr_FR.inc
new file mode 100644
index 000000000..fc928d8ed
--- /dev/null
+++ b/plugins/subscriptions_option/localization/fr_FR.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nicolas Delvaux                                               |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Utiliser les abonnements IMAP';
+
diff --git a/plugins/subscriptions_option/localization/gl_ES.inc b/plugins/subscriptions_option/localization/gl_ES.inc
index d7db28d2e..c085c263a 100644
--- a/plugins/subscriptions_option/localization/gl_ES.inc
+++ b/plugins/subscriptions_option/localization/gl_ES.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Usar suscripci籀ns IMAP';
+$labels['useimapsubscriptions'] = 'Usar suscripci籀ns IMAP';
 
-?>
diff --git a/plugins/subscriptions_option/localization/he_IL.inc b/plugins/subscriptions_option/localization/he_IL.inc
new file mode 100644
index 000000000..e91960a7e
--- /dev/null
+++ b/plugins/subscriptions_option/localization/he_IL.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/he_IL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = '蚸������蚸 ��蚳��蚸���� ��蛌��蚹����蛌 IMAP';
+
diff --git a/plugins/subscriptions_option/localization/hu_HU.inc b/plugins/subscriptions_option/localization/hu_HU.inc
new file mode 100644
index 000000000..767364870
--- /dev/null
+++ b/plugins/subscriptions_option/localization/hu_HU.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: bela                                                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'IMAP el��fizet矇sek haszn獺lata.';
+
diff --git a/plugins/subscriptions_option/localization/hy_AM.inc b/plugins/subscriptions_option/localization/hy_AM.inc
new file mode 100644
index 000000000..0769fe0a4
--- /dev/null
+++ b/plugins/subscriptions_option/localization/hy_AM.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = '��掁梲捸掁楖��晢掍晙 IMAP-晛 掅捸晡捸梮楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
+
diff --git a/plugins/subscriptions_option/localization/ja_JP.inc b/plugins/subscriptions_option/localization/ja_JP.inc
index dacea2956..206bf92a3 100644
--- a/plugins/subscriptions_option/localization/ja_JP.inc
+++ b/plugins/subscriptions_option/localization/ja_JP.inc
@@ -1,8 +1,18 @@
 <?php
 
-//  EN-Revision: 3891
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
 
 $labels = array();
-$labels['useimapsubscriptions']  = 'IMAP 鞈潸狎��芥�嫘�����雿踴��';
+$labels['useimapsubscriptions'] = 'IMAP 鞈潸狎��芥�嫘�����雿踴��';
 
-?>
diff --git a/plugins/subscriptions_option/localization/ko_KR.inc b/plugins/subscriptions_option/localization/ko_KR.inc
new file mode 100644
index 000000000..c391b2f73
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ko_KR.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'IMAP 窱禺�� ��科��';
+
diff --git a/plugins/subscriptions_option/localization/lt_LT.inc b/plugins/subscriptions_option/localization/lt_LT.inc
new file mode 100644
index 000000000..30d73b8da
--- /dev/null
+++ b/plugins/subscriptions_option/localization/lt_LT.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lt_LT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Rimas Kudelis <rq@akl.lt>                                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Naudoti IMAP prenumeratas';
+
diff --git a/plugins/subscriptions_option/localization/nl_NL.inc b/plugins/subscriptions_option/localization/nl_NL.inc
new file mode 100644
index 000000000..3664f5c18
--- /dev/null
+++ b/plugins/subscriptions_option/localization/nl_NL.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken                                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Gebruik IMAP-abonneringen';
+
diff --git a/plugins/subscriptions_option/localization/pl_PL.inc b/plugins/subscriptions_option/localization/pl_PL.inc
index 8544c7d30..15513d559 100644
--- a/plugins/subscriptions_option/localization/pl_PL.inc
+++ b/plugins/subscriptions_option/localization/pl_PL.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'U髒ywaj subskrypcji IMAP';
+$labels['useimapsubscriptions'] = 'U髒ywaj subskrypcji IMAP';
 
-?>
diff --git a/plugins/subscriptions_option/localization/pt_BR.inc b/plugins/subscriptions_option/localization/pt_BR.inc
new file mode 100644
index 000000000..b7480db6a
--- /dev/null
+++ b/plugins/subscriptions_option/localization/pt_BR.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Usar fun癟瓊o de inscri癟瓊o em pastas IMAP';
+
diff --git a/plugins/subscriptions_option/localization/pt_PT.inc b/plugins/subscriptions_option/localization/pt_PT.inc
new file mode 100644
index 000000000..13ea3a4ad
--- /dev/null
+++ b/plugins/subscriptions_option/localization/pt_PT.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Use subscri癟繭es IMAP';
+
diff --git a/plugins/subscriptions_option/localization/ru_RU.inc b/plugins/subscriptions_option/localization/ru_RU.inc
index 5deb84e0d..0d6b1d274 100644
--- a/plugins/subscriptions_option/localization/ru_RU.inc
+++ b/plugins/subscriptions_option/localization/ru_RU.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = '����郈郋郅��郱郋赲訄���� IMAP 郈郋迡郈邽��郕��';
+$labels['useimapsubscriptions'] = '����郈郋郅��郱郋赲訄���� IMAP 郈郋迡郈邽��郕��';
 
-?>
diff --git a/plugins/subscriptions_option/localization/sk_SK.inc b/plugins/subscriptions_option/localization/sk_SK.inc
new file mode 100644
index 000000000..667264af2
--- /dev/null
+++ b/plugins/subscriptions_option/localization/sk_SK.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: panda                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Pou鱉i IMAP nastavenia';
+
diff --git a/plugins/subscriptions_option/localization/sl_SI.inc b/plugins/subscriptions_option/localization/sl_SI.inc
new file mode 100644
index 000000000..3c3943482
--- /dev/null
+++ b/plugins/subscriptions_option/localization/sl_SI.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Barbara Krasovec <barbarak@arnes.si>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'Uporabi IMAP-naro��nino';
+
diff --git a/plugins/subscriptions_option/localization/sr_CS.inc b/plugins/subscriptions_option/localization/sr_CS.inc
new file mode 100644
index 000000000..c582eccd5
--- /dev/null
+++ b/plugins/subscriptions_option/localization/sr_CS.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = '��郋��邽����邽��迮 �������� 苺郈邽��邽赲訄��迮';
+
diff --git a/plugins/subscriptions_option/localization/sv_SE.inc b/plugins/subscriptions_option/localization/sv_SE.inc
index 05b7006f4..bf0ee581a 100644
--- a/plugins/subscriptions_option/localization/sv_SE.inc
+++ b/plugins/subscriptions_option/localization/sv_SE.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = 'Anv瓣nd IMAP-prenumerationer';
+$labels['useimapsubscriptions'] = 'Anv瓣nd IMAP-prenumerationer';
 
-?>
diff --git a/plugins/subscriptions_option/localization/tr_TR.inc b/plugins/subscriptions_option/localization/tr_TR.inc
new file mode 100644
index 000000000..0ebd48db3
--- /dev/null
+++ b/plugins/subscriptions_option/localization/tr_TR.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/tr_TR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: ismail yenigul                                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['useimapsubscriptions'] = 'IMAP  Aboneliklerini kullan';
+
diff --git a/plugins/subscriptions_option/localization/zh_TW.inc b/plugins/subscriptions_option/localization/zh_TW.inc
index f310b51b7..18b4bf2b1 100644
--- a/plugins/subscriptions_option/localization/zh_TW.inc
+++ b/plugins/subscriptions_option/localization/zh_TW.inc
@@ -1,6 +1,18 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
-$labels['useimapsubscriptions']  = '雿輻�沉MAP閮����';
+$labels['useimapsubscriptions'] = '雿輻�沉MAP閮����';
 
-?>
diff --git a/plugins/userinfo/localization/hy_AM.inc b/plugins/userinfo/localization/hy_AM.inc
new file mode 100644
index 000000000..76146bec3
--- /dev/null
+++ b/plugins/userinfo/localization/hy_AM.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['userinfo'] = '��掁梲桴楖梐晛 梲桴桮捸晙梮掍��';
+$labels['created'] = '��梲掍梐晢桴捸晢';
+$labels['lastlogin'] = '��掍��梬晛梮 桭楖��梲��旍`';
+$labels['defaultidentity'] = '埮梩掍晙桮捸晙 晛梮��梮楖��晥桮楖��梮梮';
+
diff --git a/plugins/userinfo/localization/ko_KR.inc b/plugins/userinfo/localization/ko_KR.inc
new file mode 100644
index 000000000..c409b6858
--- /dev/null
+++ b/plugins/userinfo/localization/ko_KR.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['userinfo'] = '��科�拖�� ���貐�';
+$labels['created'] = '�����梵��';
+$labels['lastlogin'] = '諤�鴔�諤� 諢�篞賄��';
+$labels['defaultidentity'] = '篣圉雩 ���賱�鴞�';
+
diff --git a/plugins/userinfo/localization/sr_CS.inc b/plugins/userinfo/localization/sr_CS.inc
new file mode 100644
index 000000000..fb32af46b
--- /dev/null
+++ b/plugins/userinfo/localization/sr_CS.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['userinfo'] = '��郋迡訄��邽 郋 郕郋��邽��郇邽郕��';
+$labels['created'] = '��訄郈��訄赲��迮郇郋';
+$labels['lastlogin'] = '��郋��郅迮迡��邽 ��郋迣邽郇';
+$labels['defaultidentity'] = '郈郋迡��訄郱��邾迮赲訄郇邽 邽迡迮郇��邽��迮��';
+
diff --git a/plugins/vcard_attachments/localization/hy_AM.inc b/plugins/vcard_attachments/localization/hy_AM.inc
new file mode 100644
index 000000000..5799b1cb5
--- /dev/null
+++ b/plugins/vcard_attachments/localization/hy_AM.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hy_AM/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['addvcardmsg'] = '埜桴掍晙捸��梮掍晙 vCard-旍 桹捸桵��掍捸掁����楖��桭';
+$labels['vcardsavefailed'] = 'vCard-晛 梣捸桹梣捸梮楖��桭旍 梇捸晜楖梐桴掍��';
+
diff --git a/plugins/vcard_attachments/localization/ko_KR.inc b/plugins/vcard_attachments/localization/ko_KR.inc
new file mode 100644
index 000000000..d617efbe6
--- /dev/null
+++ b/plugins/vcard_attachments/localization/ko_KR.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ko_KR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['addvcardmsg'] = '鴥潰��諢���� vCard諝� 黺�穈�';
+$labels['vcardsavefailed'] = 'vCard �����伊�� 賱�穈���伕��';
+
diff --git a/plugins/vcard_attachments/localization/sr_CS.inc b/plugins/vcard_attachments/localization/sr_CS.inc
new file mode 100644
index 000000000..e5b66ed5a
--- /dev/null
+++ b/plugins/vcard_attachments/localization/sr_CS.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['addvcardmsg'] = '��郋迡訄�� 赲虷訄��迡 �� ��迡��迮��訄��';
+$labels['vcardsavefailed'] = '郇迮邾郋��訄郇 ��訄����赲訄��邽 赲��訄��迡';
+
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 4e69520e3..7d5235be7 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -39,7 +38,6 @@ $labels['followupto'] = 'Mail-Followup-To';
 $labels['date'] = '塈��堛塈堭��堮';
 $labels['size'] = '塈��堶堿��';
 $labels['priority'] = '塈��堧��������堜';
-$labels['organization'] = '塈������婺��堜';
 $labels['readstatus'] = '堶塈��堜 塈����堭塈堙堜';
 $labels['mailboxlist'] = '��堿��堹塈堛';
 $labels['folders'] = '��堿��堹塈堛';
@@ -93,7 +91,6 @@ $labels['longnov'] = '��������堥堭';
 $labels['longdec'] = '堹��堻��堥堭';
 $labels['today'] = '塈��������';
 $labels['checkmail'] = '塈��堛堶���� ���� ��堿��堹 堭堻塈埵�� 堿堹��堹堜';
-$labels['compose'] = '堨��奡塈堙 堭堻塈��堜';
 $labels['writenewmessage'] = '堨��奡塈堙 堭堻塈��堜 堿堹��堹堜';
 $labels['replytomessage'] = '塈��堭堹 媢���� 塈��堭堻塈��堜';
 $labels['replytoallmessage'] = '塈��堭堹 媢���� 塈����堭堻�� ��堿����媢 ��堻堛��堥���� 塈��堭堻塈��堜';
@@ -161,8 +158,6 @@ $labels['msgtext'] = '��塈���� 塈��堭堻塈��堜';
 $labels['openinextwin'] = '塈��堛堶 ���� ��塈��堸堜 堿堹��堹堜';
 $labels['emlsave'] = '堛��堬���� (.eml)';
 $labels['editasnew'] = '堛媢堹���� ��堿堹��堹';
-$labels['savemessage'] = '堶��婺 ��堸�� 塈����堻��堹堜';
-$labels['sendmessage'] = '堨堭堻塈�� 塈��堭堻塈��堜 塈��堞��';
 $labels['addattachment'] = '堨堭��塈�� ������';
 $labels['charset'] = '��堿����媢堜 塈����堶塈堭��';
 $labels['editortype'] = '����媢 塈������堶堭��堭';
@@ -197,10 +192,8 @@ $labels['addcc'] = '堧媔�� CC';
 $labels['addbcc'] = '堧媔�� BCC';
 $labels['addreplyto'] = '堧媔���� Reply-To';
 $labels['addfollowupto'] = '堨媔塈��堜 Mail-Followup-To';
-$labels['mdnrequest'] = '媟��堥 塈����堭堻�� 堨媢��塈���� 媢��堹 ��堭塈堙堛�� ��堭堻塈��堛��. ���� 堛��堹 堨媢��塈�� 塈����堭堻����';
 $labels['receiptread'] = '堨��媯塈�� 塈��塈堻堛��塈�� )堥塈����堭塈堙堜)';
 $labels['yourmessage'] = '��堸塈 堨��媯塈�� 堥��堭塈堙堜 堭堻塈��堛��';
-$labels['receiptnote'] = '����塈堶婺堜: ����媢������ ��堸塈 塈��堨��媯塈�� 堥堧�� 堭堻塈��堛�� ��堹 婺��堭堛 媢���� 堿��塈堬 塈����堻堛��堥����. ����堻堛 ����塈�� 堧��堜 媔��塈��塈堛 堧�� 塈����堻堛��堥�� ��堹 ��堭堧 堧�� ������ ��堶堛����塈堛 塈��堭堻塈��堜.';
 $labels['name'] = '塈堻�� 塈��媢堭媔';
 $labels['firstname'] = '塈��堨堻�� 塈��堧����';
 $labels['surname'] = '塈��堨堻�� 塈��堧堮��堭';
@@ -285,7 +278,6 @@ $labels['importcontacts'] = '塈堻堛��堭堹 塈����堭塈堻������';
 $labels['importfromfile'] = '塈堻堛��堭堹 ���� ������:';
 $labels['importtarget'] = '堧媔�� 塈����堭塈堻������ 塈��堿堹堹 堨���� 堹��堛堭 塈��媢��塈������:';
 $labels['importreplace'] = '塈堻堛堥堹�� 堹��堛堭 塈��媢��塈������ 堥堧��������';
-$labels['importtext'] = '���������� 堭��媢 ��塈埵��堜 塈����堭塈堻������ ���� 堹��堛堭 媢��塈������ ����堿��堹.<br/>��堹媢�� 堶塈����塈�� 塈堻堛��堭塈堹 塈��媢��塈������ ���� ��堻�� 堥��塈��塈堛 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = '堛��';
 $labels['settingsfor'] = '堨媢堹塈堹塈堛';
 $labels['about'] = '��堥堸堜';
@@ -323,13 +315,13 @@ $labels['mailboxview'] = '��婺��堭 媯��堹���� 塈��堥堭��堹';
 $labels['mdnrequests'] = '媢��堹 媟��堥 堨奡媢塈堭 塈堻堛��塈��';
 $labels['askuser'] = '塈堻堧�� 塈����堻堛堮堹��';
 $labels['autosend'] = '堧堭堻����塈 堛����塈埵��塈��';
-$labels['autosendknown'] = '堧堭堻�� 堨奡媢塈堭 塈堻堛��塈�� 堨���� 堿��塈堛 塈堛媯塈������ ��堨��塈 塈堻堧������';
-$labels['autosendknownignore'] = '堧堭堻�� 堨奡媢塈堭 塈堻堛��塈�� 堨���� 堿��塈堛 塈堛媯塈������ ��堨��塈 堛堿塈���� 塈��堧��堭';
+$labels['autosendknown'] = '堧堭堻�� 堨奡媢塈堭 塈堻堛��塈�� 堨���� 堿��塈堛 塈堛媯塈������ ��堨��塈塈堻堧������';
+$labels['autosendknownignore'] = '堧堭堻�� 堨奡媢塈堭 塈堻堛��塈�� 堨���� 堿��塈堛 塈堛媯塈������ ��堨��塈堛堿塈���� 塈��堧��堭';
 $labels['ignore'] = '堛堿塈������塈';
 $labels['readwhendeleted'] = '堛堶堹��堹 塈��堭堻塈��堜 ������堭��堙堜 媢��堹 堶堸����塈';
-$labels['flagfordeletion'] = '��媔媢 媢��塈��堜 媢���� 塈��堭堻塈��堜 ��堶堸����塈 堥堹��塈�� ���� 堶堸����塈';
+$labels['flagfordeletion'] = '��媔媢 媢��塈��堜 媢���� 塈��堭堻塈��堜 ��堶堸����塈 堥堹��塈�� ����堶堸����塈';
 $labels['skipdeleted'] = '��塈 堛婺��堭 塈��堭堻塈埵�� 塈����堶堸����堜';
-$labels['deletealways'] = '堶堸�� 塈��堭堻塈埵�� ��堥塈奡堭堜�� 堨�� 堛媢堸堭 ��������塈 堨���� 塈����������塈堛';
+$labels['deletealways'] = '堶堸�� 塈��堭堻塈埵�� ��堥塈奡堭堜�� 堨�� 堛媢堸堭 ��������塈 堨����塈����������塈堛';
 $labels['showremoteimages'] = '堨婺��塈堭 塈��媯��堭 塈��堮塈堭堿��堜 塈����堹��堿堜';
 $labels['fromknownsenders'] = '������堭堻������ 塈����媢����������';
 $labels['always'] = '堹塈埵��塈��';
@@ -345,11 +337,11 @@ $labels['mimeparamfolding'] = '堧堻��塈堙 塈��������塈堛 塈����堭����堜';
 $labels['2231folding'] = 'RFC 2231 堥堧��������塈 (堳��堹堭堥��堭堹)';
 $labels['miscfolding'] = 'RFC 2047/2231 (������堭��堻����堛 堞��堛������)';
 $labels['2047folding'] = 'RFC 2047 堥堧��������塈 (媞��堭��塈)';
-$labels['force7bit'] = '塈堻堛堮堹塈�� 堛堭����堬 MIME ����堶堭���� 堸塈堛 塈��堳��塈����堜 堥堛��塈堛';
+$labels['force7bit'] = '塈堻堛堮堹塈�� 堛堭����堬 MIME ����堶堭���� 堸塈堛 塈��堳��塈����堜堥堛��塈堛';
 $labels['advancedoptions'] = '堮��塈堭塈堛 ��堛��堹����堜';
-$labels['focusonnewmessage'] = '塈��堛堭����堬 媢���� ��塈��堸堜 塈����堛媯��堶 媢��堹 ��堿��堹 堭堻塈��堜 堿堹��堹堜';
-$labels['checkallfolders'] = '塈��堛堶���� ���� ��堿��堹 堭堻塈埵�� 堿堹��堹堜 ���� 堿����媢 塈����堿��堹塈堛';
-$labels['displaynext'] = '堨婺��塈堭 塈��堭堻塈��堜 塈��堛塈����堜 堥媢堹 堶堸��/������ 塈��堭堻塈��堜 塈��堶塈����堜';
+$labels['focusonnewmessage'] = '塈��堛堭����堬 媢���� ��塈��堸堜 塈����堛媯��堶 媢��堹 ��堿��堹 堭堻塈��堜堿堹��堹堜';
+$labels['checkallfolders'] = '塈��堛堶���� ���� ��堿��堹 堭堻塈埵�� 堿堹��堹堜 ���� 堿����媢塈����堿��堹塈堛';
+$labels['displaynext'] = '堨婺��塈堭 塈��堭堻塈��堜 塈��堛塈����堜 堥媢堹 堶堸��/������塈��堭堻塈��堜 塈��堶塈����堜';
 $labels['mainoptions'] = '塈��堮��塈堭塈堛 塈��堧堻塈堻��堜';
 $labels['section'] = '��堻��';
 $labels['maintenance'] = '塈��媯��塈��堜';
@@ -370,9 +362,9 @@ $labels['previewpanemarkread'] = '堛堶堹��堹 塈��堭堻塈埵�� 塈������媢塈����堜 �
 $labels['afternseconds'] = '堥媢堹 $n 堳��塈����';
 $labels['reqmdn'] = '媟��堥 堨奡媢塈堭 塈堻堛��塈�� 堹塈埵��塈��';
 $labels['reqdsn'] = '媟��堥 堛�������� ��堶塈��堜 塈��堛��媯���� 堹塈埵��塈��';
-$labels['replysamefolder'] = '��媔媢 塈��堭堹��堹 ���� 塈����堿��堹 塈��堸�� ��堶���� 塈��堭堻塈��堜 塈����堭堹��堹 媢������塈';
-$labels['defaultaddressbook'] = '堧媔�� 塈����堭塈堻������ 塈��堿堹��堹 堨���� 堹��堛堭 塈��媢��塈������ 塈����堶堹堹';
-$labels['autocompletesingle'] = '堛堿塈���� 媢����塈�� 塈��堥堭��堹 塈��堨����堛堭������ 塈��堥堹���� ���� 塈��堛������堜 塈��堛����塈埵��堜';
+$labels['replysamefolder'] = '��媔媢 塈��堭堹��堹 ���� 塈����堿��堹 塈��堸�� ��堶���� 塈��堭堻塈��堜塈����堭堹��堹 媢������塈';
+$labels['defaultaddressbook'] = '堧媔�� 塈����堭塈堻������ 塈��堿堹��堹 堨���� 堹��堛堭 塈��媢��塈������塈����堶堹堹';
+$labels['autocompletesingle'] = '堛堿塈���� 媢����塈�� 塈��堥堭��堹 塈��堨����堛堭������ 塈��堥堹���� ����塈��堛������堜 塈��堛����塈埵��堜';
 $labels['spellcheckbeforesend'] = '堛堶���� ���� 塈��堨����塈堙 ��堥�� 堨堭堻塈�� 塈��堭堻塈埵��';
 $labels['spellcheckoptions'] = '堮��塈堭塈堛 塈��堛堹������ 塈��堨����塈堙��';
 $labels['spellcheckignoresyms'] = '堛堿塈���� 塈��������塈堛 塈��堛�� 堛堶堛���� 堭����堬';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index df1d2843e..eda96270c 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -9,16 +9,14 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
 $messages['loginfailed'] = '��奡�� 堛堻堿���� 塈��堹堮����';
 $messages['cookiesdisabled'] = '塈����堛媯��堶 塈��堮塈媯 堥�� ��塈 ����堥�� 塈����������堬';
-$messages['sessionerror'] = '塈��堛��堛 媯��塈堶��堜 塈��堿��堻堜 塈��堶塈����堜 堧�� 堧����塈 媞��堭 媯塈��堶堜';
-$messages['storageerror'] = '��奡�� 塈��塈堛媯塈�� 堥堮塈堹�� IMAP';
+$messages['sessionerror'] = '塈��堛��堛 媯��塈堶��堜 塈��堿��堻堜 塈��堶塈����堜 堧�� 堧����塈 媞��堭媯塈��堶堜';
 $messages['servererror'] = '堮媟堧 ���� 塈��堮塈堹��!';
 $messages['servererrormsg'] = '堮媟堧 堮塈堹��: $msg';
 $messages['dberror'] = '堮媟堧 ���� ��塈媢堹堜 塈��堥��塈��塈堛!';
@@ -38,14 +36,14 @@ $messages['messagesent'] = '堛�� 堨堭堻塈�� 塈��堭堻塈��堜 堥��堿塈堶';
 $messages['savingmessage'] = '堶��婺 塈��堭堻塈��堜...';
 $messages['messagesaved'] = '堛�� 堶��婺 塈��堭堻塈��堜 ���� 塈����堻��堹塈堛';
 $messages['successfullysaved'] = '堛�� 塈��堶��婺 堥��堿塈堶';
-$messages['addedsuccessfully'] = '堛��堛 堨媔塈��堜 塈����堭塈堻�� 堨���� 堹��堛堭 塈��媢��塈������ 堥��堿塈堶';
-$messages['contactexists'] = '����塈�� ��堭塈堻�� ���� ����堻 ��堸塈 塈��堥堭��堹 塈��塈����堛堭������ ����堿��堹 ��堻堥��塈��';
+$messages['addedsuccessfully'] = '堛��堛 堨媔塈��堜 塈����堭塈堻�� 堨���� 堹��堛堭 塈��媢��塈������堥��堿塈堶';
+$messages['contactexists'] = '����塈�� ��堭塈堻�� ���� ����堻 ��堸塈 塈��堥堭��堹 塈��塈����堛堭����������堿��堹 ��堻堥��塈��';
 $messages['contactnameexists'] = '����塈�� ����堭堻塈�� ���� ����堻 塈��堨堻�� ����堿��堹 ��堻堥��塈��.';
-$messages['blockedimages'] = '��堶��塈��堜 堮媯��媯��堛���� 堛�� 堶堿堥 塈��媯��堭 塈��媞��堭 ��媔����堜 (塈��堥媢��堹堜) ���� ��堸�� 塈��堭堻塈��堜.';
+$messages['blockedimages'] = '��堶��塈��堜 堮媯��媯��堛���� 堛�� 堶堿堥 塈��媯��堭 塈��媞��堭 ��媔����堜(塈��堥媢��堹堜) ���� ��堸�� 塈��堭堻塈��堜.';
 $messages['encryptedmessage'] = '��堸�� 塈��堭堻塈��堜 ��奡��堭堜 ����塈 �������� 媢堭媔��塈. 媢堸堭塈��!';
 $messages['nocontactsfound'] = '���� ��媢堳堭 媢���� 堧�� ��堭塈堻��';
 $messages['contactnotfound'] = '堛媢堸堭 塈��媢堳��堭 媢���� 塈����堭塈堻�� 塈����媟����堥';
-$messages['contactsearchonly'] = '塈��堛堥 堥媢媔 ������塈堛 塈��堥堶堳 ����媢堳��堭 媢���� 塈������堭塈堻������';
+$messages['contactsearchonly'] = '塈��堛堥 堥媢媔 ������塈堛 塈��堥堶堳 ����媢堳��堭 媢����塈������堭塈堻������';
 $messages['sendingfailed'] = '��奡�� 堨堭堻塈�� 塈��堭堻塈��堜';
 $messages['senttooquickly'] = '堭堿塈堙 塈��堛婺堭 $sec 堳��塈�� ��堥�� 堨堭堻塈�� ��堸�� 塈��堭堻塈��堜';
 $messages['errorsavingsent'] = '堶堹堳 堮媟堧 堧堳��塈堙 堶��婺 塈��堭堻塈��堜 塈������堭堻��堜';
@@ -58,7 +56,7 @@ $messages['deletecontactconfirm'] = '���� 堛堭��堹 堶��塈�� 堶堸�� 塈����堭塈堻�
 $messages['deletegroupconfirm'] = '���� 堛堭��堹 ��媢��塈�� 堶堸�� 塈����堿����媢堜 塈����堶堹堹堜��';
 $messages['deletemessagesconfirm'] = '���� 堛堭��堹 堶堸�� 塈��堭堻塈埵�� 塈����堶堹堹堜��';
 $messages['deletefolderconfirm'] = '���� 堛堭��堹 堶��塈�� 堶堸�� ��堸塈 塈����堿��堹��';
-$messages['purgefolderconfirm'] = '���� 堛堭��堹 堶��塈�� 堶堸�� 堿����媢 塈��堭堻塈埵�� ���� ��堸塈 塈����堿��堹��';
+$messages['purgefolderconfirm'] = '���� 堛堭��堹 堶��塈�� 堶堸�� 堿����媢 塈��堭堻塈埵�� ���� ��堸塈塈����堿��堹��';
 $messages['contactdeleting'] = '堿塈堭�� 堶堸�� 塈������堭塈堻������...';
 $messages['groupdeleting'] = '堿塈堭�� 堶堸�� 塈����堿����媢堜...';
 $messages['folderdeleting'] = '堿塈堭�� 堶堸�� 塈����堿��堹...';
@@ -69,14 +67,13 @@ $messages['formincomplete'] = '���� ��堛�� 堛媢堥埵堜 堥��塈��塈堛 塈��塈堻堛���
 $messages['noemailwarning'] = '塈��堭堿塈堙 堨堹堮塈�� 媢����塈�� 堥堭��堹 堨����堛堭������ 媯塈��堶';
 $messages['nonamewarning'] = '塈��堭堿塈堙 堨堹堮塈�� 塈堻��';
 $messages['nopagesizewarning'] = '塈��堭堿塈堙 堨堹堮塈�� 堶堿�� 塈��媯��堶堜';
-$messages['nosenderwarning'] = '堭堿塈堙 塈��堛堥 媢����塈�� 塈��堥堭��堹 塈��塈����堛堭������ ��������堭堻��';
+$messages['nosenderwarning'] = '堭堿塈堙 塈��堛堥 媢����塈�� 塈��堥堭��堹 塈��塈����堛堭��������������堭堻��';
 $messages['norecipientwarning'] = '塈��堭堿塈堙 堨堹堮塈�� 塈堻�� ��堻堛��堥�� ��塈堶堹 媢���� 塈��堧����';
-$messages['nosubjectwarning'] = '堶���� "塈������媔��媢" ��塈堭媞. ���� 堛堭��堹 ��堛塈堥堜 ����媔��媢 ����堭堻塈��堜��';
+$messages['nosubjectwarning'] = '堶���� "塈������媔��媢" ��塈堭媞. ���� 堛堭��堹 ��堛塈堥堜 ����媔��媢����堭堻塈��堜��';
 $messages['nobodywarning'] = '堨堭堻塈�� ��堸�� 塈��堭堻塈��堜 堹���� ��媯��';
-$messages['notsentwarning'] = '���� ��堛�� 堨堭堻塈�� 塈��堭堻塈��堜. ���� 堛堭��堹 堛堿塈���� 塈��堭堻塈��堜��';
+$messages['notsentwarning'] = '���� ��堛�� 堨堭堻塈�� 塈��堭堻塈��堜. ���� 堛堭��堹 堛堿塈����塈��堭堻塈��堜��';
 $messages['noldapserver'] = '塈��堭堿塈堙 塈堮堛��塈堭 堮塈堹�� ldap ����堥堶堳 ������';
-$messages['nosearchname'] = '塈��堭堿塈堙 堨堹堮塈�� 塈堻�� ��堭塈堻�� 堧�� 媢����塈�� 堥堭��堹 堨����堛堭������';
-$messages['notuploadedwarning'] = '���� ��堛�� 堭��媢 堿����媢 塈����堭����塈堛 堥媢堹. 堭堿塈堙�� 塈��塈��堛婺塈堭 堧�� 堨��媞塈堙 媢������堜 塈��堭��媢.';
+$messages['nosearchname'] = '塈��堭堿塈堙 堨堹堮塈�� 塈堻�� ��堭塈堻�� 堧�� 媢����塈�� 堥堭��堹堨����堛堭������';
 $messages['searchsuccessful'] = '媢堳堭 媢���� $nr 堭堻塈埵��';
 $messages['contactsearchsuccessful'] = '媢��堳堭 媢���� $nr ����堭塈堻����';
 $messages['searchnomatch'] = '���� ��媢堳堭 媢���� 奡��堙';
@@ -92,7 +89,7 @@ $messages['deletedsuccessfully'] = '堛�� 塈��堶堸�� 堥��堿塈堶';
 $messages['converting'] = '堨堬塈��堜 塈��堛��堻���� ���� 塈��堭堻塈��堜...';
 $messages['messageopenerror'] = '堛媢堸堭堛 ��堭塈堙堜 塈��堭堻塈��堜 ���� 塈��堮塈堹��';
 $messages['fileuploaderror'] = '��奡�� 堭��媢 塈��������';
-$messages['filesizeerror'] = '堶堿�� 塈�������� 塈��堸�� 堛堶塈���� 堭��媢�� 堧��堥堭 ���� 塈��堶堿�� 塈��堧��媯�� $size';
+$messages['filesizeerror'] = '堶堿�� 塈�������� 塈��堸�� 堛堶塈���� 堭��媢�� 堧��堥堭 ���� 塈��堶堿��塈��堧��媯�� $size';
 $messages['copysuccess'] = '堛�� ��堻堮 $nr 堭堻塈埵�� 堥��堿塈堶';
 $messages['copyerror'] = '���� �������� ��堻堮 堧��堜 媢��塈������';
 $messages['sourceisreadonly'] = '��塈 �������� 堛媢堹���� ��媯堹堭 塈��媢����塈�� ��堸塈';
@@ -106,20 +103,18 @@ $messages['addingmember'] = '堿塈堭�� 堨媔塈��堜 塈������堭塈堻������ 堨���� 塈�
 $messages['removingmember'] = '堿塈堭�� 堨堬塈��堜 塈����堭塈堻������ ���� 塈����堿����媢堜...';
 $messages['receiptsent'] = '堧堭堻�� 堨��媯塈�� 塈��塈堻堛��塈�� 堥��堿塈堶';
 $messages['errorsendingreceipt'] = '堛媢堸堭 堨堭堻塈�� 堨��媯塈�� 塈��塈堻堛��塈��';
-$messages['nodeletelastidentity'] = '��塈 �������� 堶堸�� ��堸塈 塈��堻堿�� 堶��堳 堧���� 塈����堶��堹 塈����堛堥����.';
+$messages['nodeletelastidentity'] = '��塈 �������� 堶堸�� ��堸塈 塈��堻堿�� 堶��堳 堧���� 塈����堶��堹塈����堛堥����.';
 $messages['forbiddencharacter'] = '塈堻�� 塈����堿����堹 ��堶堛���� 堶堭����塈�� ��������媢堜';
 $messages['selectimportfile'] = '堭堿塈堙 塈堮堛堭 ������塈�� ��堭��媢��';
 $messages['addresswriterror'] = '堹��堛堭 塈��媢��塈������ 塈����堶堹堹 媞��堭 ��塈堥�� ������堛塈堥堜';
-$messages['contactaddedtogroup'] = '堛��堛 堨媔塈��堜 塈����堭塈堻������ 堨���� ��堸�� 塈����堿����媢堜 堥��堿塈堶';
-$messages['contactremovedfromgroup'] = '堛��堛 堨堬塈��堜 塈����堭塈堻������ ���� ��堸�� 塈����堿����媢堜 堥��堿塈堶';
+$messages['contactaddedtogroup'] = '堛��堛 堨媔塈��堜 塈����堭塈堻������ 堨���� ��堸�� 塈����堿����媢堜堥��堿塈堶';
+$messages['contactremovedfromgroup'] = '堛��堛 堨堬塈��堜 塈����堭塈堻������ ���� ��堸�� 塈����堿����媢堜堥��堿塈堶';
 $messages['importwait'] = '堿塈堭�� 塈��塈堻堛��堭塈堹�� 堭堿塈堙 塈��堛婺堭...';
-$messages['importerror'] = '��奡�� 塈��塈堻堛��堭塈堹! 塈�������� 塈����堭����媢 ����堻 ������ vCard 媯塈��堶.';
-$messages['importconfirm'] = '<b>堛�� 塈堻堛��堭塈堹 $inserted ��堭塈堻������ 堥��堿塈堶�� ��堛堿塈���� $skipped ����堿��堹���� ��堻堥��塈��</b>:<p><em>$names</em></p>';
+$messages['importerror'] = '��奡�� 塈��塈堻堛��堭塈堹! 塈�������� 塈����堭����媢 ����堻 ������ vCard媯塈��堶.';
+$messages['importconfirm'] = '<b>堛�� 塈堻堛��堭塈堹 $inserted ��堭塈堻������ 堥��堿塈堶�� ��堛堿塈����$skipped ����堿��堹���� ��堻堥��塈��</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>堛�� 堛堿塈���� $skipped 媢��塈媯堭 ����堿��堹堜</b>';
 $messages['opnotpermitted'] = '塈��媢������堜 ��������媢堜!';
-$messages['nofromaddress'] = '媢����塈�� 塈��堥堭��堹 塈��塈����堛堭������ 媞��堭 ��堶堹堹 ���� 塈����������堜 塈������堛��塈堜';
-$messages['editorwarning'] = '��堛堻堥堥 塈��塈��堛��塈�� 堨���� ��堶堭堭 塈����媯 塈��堥堻��媟 堥媔��塈媢 堿����媢 塈��堛��堻����. ���� 堛堭��堹 塈��塈堻堛��堭塈堭��';
-$messages['httpreceivedencrypterror'] = '堶堹堳 堮媟堧 堿堻���� ���� 塈��堛����埵堜. 堭堿塈堙�� 塈堛媯塈�� 堥��堹��堭 塈��堮塈堹�� 堶塈��塈��. <b>��塈 �������� 堨堭堻塈�� 堥堭��堹��.</b>';
+$messages['nofromaddress'] = '媢����塈�� 塈��堥堭��堹 塈��塈����堛堭������ 媞��堭 ��堶堹堹 ����塈����������堜 塈������堛��塈堜';
 $messages['smtpconnerror'] = '堮媟堧 SMTP ($code): 堛媢堸堭 塈��塈堛媯塈�� 堥塈��堮塈堹��';
 $messages['smtpautherror'] = '堮媟堧 SMTP ($code): 堛媢堸堭 塈��堛堶���� ���� ������堛��';
 $messages['smtpfromerror'] = '堮媟堧 SMTP ($code): 堛媢堸堭 堛堶堹��堹 塈����堭堻�� "$from" ($msg)';
@@ -145,14 +140,14 @@ $messages['messagedeleted'] = '堛�� 堶堸�� 塈��堭堻塈埵�� 堥��堿塈堶';
 $messages['messagemoved'] = '堛�� ������ 塈��堭堻塈埵�� 堥��堿塈堶';
 $messages['messagecopied'] = '堛�� ��堻堮 塈��堭堻塈埵�� 堥��堿塈堶';
 $messages['messagemarked'] = '堛�� 堛堶堹��堹 塈��堭堻塈埵�� 堥��堿塈堶';
-$messages['autocompletechars'] = '堨��堛堥 $min 堧堶堭�� 媢���� 塈��堧���� ����堶媯���� 媢���� 塈��堛������堜 塈��堛����塈埵��堜';
-$messages['autocompletemore'] = '����塈�� 塈����堬��堹 ���� 塈����堛塈埵堿 塈����媟塈堥��堜. 堭堿塈堙 塈��堛堥 ������塈堛 堥堶堳 堧��堳堭.';
+$messages['autocompletechars'] = '堨��堛堥 $min 堧堶堭�� 媢���� 塈��堧���� ����堶媯���� 媢���� 塈��堛������堜塈��堛����塈埵��堜';
+$messages['autocompletemore'] = '����塈�� 塈����堬��堹 ���� 塈����堛塈埵堿 塈����媟塈堥��堜. 堭堿塈堙塈��堛堥 ������塈堛 堥堶堳 堧��堳堭.';
 $messages['namecannotbeempty'] = '��塈 �������� 堛堭�� 塈��堨堻�� ��塈堭媞塈��';
 $messages['nametoolong'] = '塈��堨堻�� 媟������ 堿堹塈��';
 $messages['folderupdated'] = '堛�� 堛堶堹��堳 塈����堿��堹 堥��堿塈堶';
 $messages['foldercreated'] = '堛�� 堨��奡塈堙 塈����堿��堹 堥��堿塈堶';
 $messages['invalidimageformat'] = '����堻堛 媯��媞堜 媯��堭堜 媯堶��堶堜';
 $messages['mispellingsfound'] = '媢��堳堭 媢���� 堧堮媟塈堙 堨����塈埵��堜 ���� 塈��堭堻塈��堜';
-$messages['parentnotwritable'] = '堛媢堸堭 堨��奡塈堙/������ 塈����堿��堹 堨���� 塈����堿��堹 塈����堶堹堹. ����堻堛 ��堹���� 塈��媯��塈堶��堜.';
+$messages['parentnotwritable'] = '堛媢堸堭 堨��奡塈堙/������ 塈����堿��堹 堨���� 塈����堿��堹 塈����堶堹堹.����堻堛 ��堹���� 塈��媯��塈堶��堜.';
 $messages['messagetoobig'] = '堿堬堙 塈��堭堻塈��堜 堧��堥堭 堥��堳��堭 ����塈 �������� ��媢塈��堿堛��.';
 
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 9ed06a7d5..3c5340654 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Kenan Dervi禳evi�� <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Neuspje禳na konekcija na IMAP server';
 $messages['servererror'] = 'Serverska gre禳ka!';
 $messages['servererrormsg'] = 'Serverska gre禳ka: $msg';
 $messages['dberror'] = 'Gre禳ka u bazi podataka!';
+$messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije mogu��e izvr禳iti operaciju. Folder je samo za ��itanje.';
 $messages['errornoperm'] = 'Nije mogu��e izvr禳iti operaciju. Pristup je odbijen.';
 $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sa��uvani.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index f0f23f732..908922ace 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -21,10 +20,10 @@ $labels['password'] = 'Contrasenya';
 $labels['server'] = 'Servidor';
 $labels['login'] = 'Entra';
 $labels['logout'] = 'Tanca sessi籀';
-$labels['mail'] = 'E-Mail';
+$labels['mail'] = 'Correu';
 $labels['settings'] = 'Configuraci籀';
 $labels['addressbook'] = 'Contactes';
-$labels['inbox'] = 'Entrada';
+$labels['inbox'] = 'Safata d\'entrada';
 $labels['drafts'] = 'Esborranys';
 $labels['sent'] = 'Enviats';
 $labels['trash'] = 'Paperera';
@@ -32,34 +31,36 @@ $labels['junk'] = 'Correu brossa';
 $labels['subject'] = 'Assumpte';
 $labels['from'] = 'Remitent';
 $labels['to'] = 'Destinatari';
-$labels['cc'] = 'CC';
-$labels['bcc'] = 'BCC';
+$labels['cc'] = 'Cc';
+$labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Respon a';
-$labels['followupto'] = 'Seguiment-Per';
+$labels['followupto'] = 'Seguiment-a';
 $labels['date'] = 'Data';
-$labels['size'] = 'Grand��ria';
+$labels['size'] = 'Mida';
 $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organitzaci籀';
 $labels['readstatus'] = 'Estat de lectura';
+$labels['listoptions'] = 'Llista d\'opcions...';
 $labels['mailboxlist'] = 'Carpetes';
 $labels['folders'] = 'Carpetes';
 $labels['messagesfromto'] = 'Missatges des de $from a $to de $count';
 $labels['threadsfromto'] = 'Fils $from a $to de $count';
 $labels['messagenrof'] = 'Missatge $nr de $count';
+$labels['fromtoshort'] = '$from - $to de $count';
 $labels['copy'] = 'Copia';
 $labels['move'] = 'Mou';
-$labels['moveto'] = 'mou a...';
-$labels['download'] = 'descarrega';
+$labels['moveto'] = 'Mou a...';
+$labels['download'] = 'Descarrega';
 $labels['filename'] = 'Nom del fitxer';
-$labels['filesize'] = 'Grand��ria de fitxer';
+$labels['filesize'] = 'Mida del fitxer';
 $labels['addtoaddressbook'] = 'Afegeix a contactes';
-$labels['sun'] = 'DG';
-$labels['mon'] = 'DL';
-$labels['tue'] = 'DM';
-$labels['wed'] = 'DC';
-$labels['thu'] = 'DJ';
-$labels['fri'] = 'DV';
-$labels['sat'] = 'DS';
+$labels['sun'] = 'Diu';
+$labels['mon'] = 'Dll';
+$labels['tue'] = 'Dmt';
+$labels['wed'] = 'Dmc';
+$labels['thu'] = 'Dij';
+$labels['fri'] = 'Div';
+$labels['sat'] = 'Dis';
 $labels['sunday'] = 'Diumenge';
 $labels['monday'] = 'Dilluns';
 $labels['tuesday'] = 'Dimarts';
@@ -71,8 +72,8 @@ $labels['jan'] = 'gen';
 $labels['feb'] = 'feb';
 $labels['mar'] = 'mar';
 $labels['apr'] = 'abr';
-$labels['may'] = 'maig';
-$labels['longmay'] = 'maig';
+$labels['may'] = 'mai';
+$labels['longmay'] = 'mai';
 $labels['jun'] = 'jun';
 $labels['jul'] = 'jul';
 $labels['aug'] = 'ago';
@@ -92,31 +93,38 @@ $labels['longoct'] = 'octubre';
 $labels['longnov'] = 'novembre';
 $labels['longdec'] = 'desembre';
 $labels['today'] = 'Avui';
+$labels['refresh'] = 'Actualitza';
 $labels['checkmail'] = 'Recupera missatges nous';
 $labels['compose'] = 'Escriu un missatge';
-$labels['writenewmessage'] = 'Crea nou missatge';
-$labels['replytomessage'] = 'Respon al missatge';
+$labels['writenewmessage'] = 'Crea un nou missatge';
+$labels['reply'] = 'Respon';
+$labels['replytomessage'] = 'Respon al remitent';
 $labels['replytoallmessage'] = 'Respon al remitent i a tots els destinataris';
-$labels['replyall'] = 'Respondre a tots';
+$labels['replyall'] = 'Respon a tots';
 $labels['replylist'] = 'Llista de resposta';
-$labels['forwardinline'] = 'Reenvia';
-$labels['forwardattachment'] = 'Reenvia adjunt';
-$labels['forwardmessage'] = 'Reenvia missatge';
-$labels['deletemessage'] = 'Suprimeix missatge';
-$labels['movemessagetotrash'] = 'Mou missatge a la paperera';
+$labels['forward'] = 'Reenvia';
+$labels['forwardinline'] = 'Reenvia com en l穩nia';
+$labels['forwardattachment'] = 'Reenvia com a adjunt';
+$labels['forwardmessage'] = 'Reenvia el missatge';
+$labels['deletemessage'] = 'Suprimeix el missatge';
+$labels['movemessagetotrash'] = 'Mou el missatge a la paperera';
 $labels['printmessage'] = 'Imprimeix aquest missatge';
 $labels['previousmessage'] = 'Mostra el missatge anterior';
 $labels['firstmessage'] = 'Mostra el primer missatge';
 $labels['nextmessage'] = 'Mostra el missatge seg羹ent';
 $labels['lastmessage'] = 'Mostra l\'繳ltim missatge';
 $labels['backtolist'] = 'Torna a la llista de missatges';
-$labels['viewsource'] = 'Visualitza el codi font';
+$labels['viewsource'] = 'Mostra el codi font';
+$labels['mark'] = 'Marca';
 $labels['markmessages'] = 'Marca missatges';
 $labels['markread'] = 'Com a llegits';
 $labels['markunread'] = 'Com a no llegits';
-$labels['markflagged'] = 'Com marcat';
-$labels['markunflagged'] = 'Com no marcat';
+$labels['markflagged'] = 'Com a marcat';
+$labels['markunflagged'] = 'Com a no marcat';
 $labels['moreactions'] = 'M矇s accions...';
+$labels['more'] = 'M矇s';
+$labels['back'] = 'Torna';
+$labels['options'] = 'Opcions';
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
@@ -125,21 +133,21 @@ $labels['currpage'] = 'P��gina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
-$labels['deleted'] = 'Esborrat';
+$labels['deleted'] = 'Suprimit';
 $labels['invert'] = 'Inverteix';
 $labels['filter'] = 'Filtre';
 $labels['list'] = 'Llista';
-$labels['threads'] = 'Fils';
+$labels['threads'] = 'Fils de discusi籀';
 $labels['expand-all'] = 'Expandeix tots';
 $labels['expand-unread'] = 'Expandeix No llegits';
-$labels['collapse-all'] = 'Col繚lapsa tots';
+$labels['collapse-all'] = 'Redueix tots';
 $labels['threaded'] = 'Encadenat';
 $labels['autoexpand_threads'] = 'Expandeix els missatges encadenats';
-$labels['do_expand'] = 'tots els fils';
+$labels['do_expand'] = 'tots els fils de discusi籀';
 $labels['expand_only_unread'] = 'nom矇s amb missatges no llegits';
 $labels['fromto'] = 'Remitent/Destinatari';
 $labels['flag'] = 'Marca';
-$labels['attachment'] = 'Adjunt';
+$labels['attachment'] = 'Adjunci籀';
 $labels['sentdate'] = 'Data d\'enviament';
 $labels['arrival'] = 'Data d\'arribada';
 $labels['asc'] = 'ascendent';
@@ -151,7 +159,7 @@ $labels['listmode'] = 'Mode de vista de llista';
 $labels['folderactions'] = 'Accions de carpeta';
 $labels['compact'] = 'Compacta';
 $labels['empty'] = 'Buida';
-$labels['quota'] = 'Utilitzaci籀 de disc';
+$labels['quota'] = '��s del disc';
 $labels['unknown'] = 'desconegut';
 $labels['unlimited'] = 'il繚limitat';
 $labels['quicksearch'] = 'Cerca r��pida';
@@ -162,44 +170,46 @@ $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
 $labels['editasnew'] = 'Edita com a nou';
 $labels['savemessage'] = 'Desa aquest esborrany';
-$labels['sendmessage'] = 'Envia ara el missatge';
-$labels['addattachment'] = 'Afegeix un fitxer';
+$labels['sendmessage'] = 'Envia el missatge';
+$labels['addattachment'] = 'Adjunta un fitxer';
 $labels['charset'] = 'Codificaci籀 de car��cters';
 $labels['editortype'] = 'Tipus d\'editor';
 $labels['returnreceipt'] = 'Confirmaci籀 de recepci籀';
 $labels['dsn'] = 'Notificaci籀 d\'estat de lliurament';
 $labels['mailreplyintro'] = 'A $date, $sender escrigu矇:';
 $labels['originalmessage'] = 'Missatge Original';
-$labels['editidents'] = 'Editar identitats';
+$labels['editidents'] = 'Edita identitats';
+$labels['spellcheck'] = 'Ortografia';
 $labels['checkspelling'] = 'Comprova l\'ortografia';
-$labels['resumeediting'] = 'Continua l\'edici籀';
+$labels['resumeediting'] = 'Repr癡n l\'edici籀';
 $labels['revertto'] = 'Torna a';
-$labels['attachments'] = 'Adjunts';
+$labels['attach'] = 'Adjunta';
+$labels['attachments'] = 'Adjuncions';
 $labels['upload'] = 'Afegeix';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Cancel繚la';
+$labels['close'] = 'Tanca';
 $labels['messageoptions'] = 'Opcions de missatge...';
 $labels['low'] = 'Baixa';
-$labels['lowest'] = 'Molt baixa';
+$labels['lowest'] = 'La m矇s baixa';
 $labels['normal'] = 'Normal';
 $labels['high'] = 'Alta';
-$labels['highest'] = 'Molt alta';
+$labels['highest'] = 'La m矇s alta';
 $labels['nosubject'] = '(sense assumpte)';
-$labels['showimages'] = 'Mostra imatges';
-$labels['alwaysshow'] = 'Sempre mostra imatges de $sender';
+$labels['showimages'] = 'Mostra les imatges';
+$labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
 $labels['isdraft'] = 'Aquest 矇s un missatge esborrany.';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Text pla';
+$labels['plaintoggle'] = 'Text net';
 $labels['savesentmessagein'] = 'Desa el missatge enviat a';
-$labels['dontsave'] = 'no deseu';
-$labels['maxuploadsize'] = 'El tamany m��xim de fitxer 矇s $size';
+$labels['dontsave'] = 'no ho desis';
+$labels['maxuploadsize'] = 'El mida m��xima del fitxer 矇s $size';
 $labels['addcc'] = 'Afegeix Cc';
 $labels['addbcc'] = 'Afegeix Bcc';
-$labels['addreplyto'] = 'Afegeix Reply-To';
-$labels['addfollowupto'] = 'Afegir Seguiment-Per';
+$labels['addreplyto'] = 'Afegeix Respon-A';
+$labels['addfollowupto'] = 'Afegir Seguiment-A';
 $labels['mdnrequest'] = 'El remitent d\'aquest missatge ha demanat ser notificat quan llegiu aquest missatge. Voleu notificar al remitent?';
 $labels['receiptread'] = 'Confirmaci籀 de recepci籀';
-$labels['yourmessage'] = 'Aquesta 矇s una confirmaci籀 de recepci籀 per al vostre missatge';
+$labels['yourmessage'] = 'Aix簷 矇s una confirmaci籀 de recepci籀 per al vostre missatge';
 $labels['receiptnote'] = 'Nota: Aquesta confirmaci籀 nom矇s indica que el missatge ha estat mostrat a l\'ordinador del destinatari. No hi ha garantia que el destinatari hagi llegit o ent癡s el contingut del missatge.';
 $labels['name'] = 'Nom a mostrar';
 $labels['firstname'] = 'Nom';
@@ -212,7 +222,7 @@ $labels['jobtitle'] = 'C��rrec';
 $labels['department'] = 'Departament';
 $labels['gender'] = 'Sexe';
 $labels['maidenname'] = 'Cognom de Solter/a';
-$labels['email'] = 'E-Mail';
+$labels['email'] = 'Correu electr簷nic';
 $labels['phone'] = 'Tel癡fon';
 $labels['address'] = 'Adre癟a';
 $labels['street'] = 'Carrer';
@@ -220,37 +230,38 @@ $labels['locality'] = 'Ciutat';
 $labels['zipcode'] = 'Codi postal';
 $labels['region'] = 'Estat/Prov穩ncia';
 $labels['country'] = 'Pa穩s';
-$labels['birthday'] = 'Aniversari';
+$labels['birthday'] = 'Data de naixement';
 $labels['anniversary'] = 'Aniversari';
 $labels['website'] = 'P��gina web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'mascul穩';
-$labels['female'] = 'femen穩';
+$labels['male'] = 'home';
+$labels['female'] = 'dona';
 $labels['manager'] = 'Gerent';
 $labels['assistant'] = 'Assistent';
 $labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'C簷njuge';
 $labels['allfields'] = 'Tots els camps';
-$labels['search'] = 'Cercar';
+$labels['search'] = 'Cerca';
 $labels['advsearch'] = 'Cerca Avan癟ada';
-$labels['other'] = 'Altre';
-$labels['typeother'] = 'Altre';
+$labels['advanced'] = 'Par��metres avan癟ats';
+$labels['other'] = 'Un altre';
+$labels['typeother'] = 'Un altre';
 $labels['typehome'] = 'Casa';
 $labels['typework'] = 'Feina';
 $labels['typemobile'] = 'M簷bil';
 $labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax de Casa';
-$labels['typeworkfax'] = 'Fax de la Feina';
+$labels['typehomefax'] = 'Fax particular';
+$labels['typeworkfax'] = 'Fax de la feina';
 $labels['typecar'] = 'Cotxe';
-$labels['typepager'] = 'Paginador';
+$labels['typepager'] = 'Cercapersones';
 $labels['typevideo'] = 'V穩deo';
 $labels['typehomepage'] = 'P��gina Inicial';
-$labels['typeblog'] = 'Blog';
+$labels['typeblog'] = 'Bloc';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Afegeix camp...';
-$labels['addcontact'] = 'Afegeix nou contacte';
-$labels['editcontact'] = 'Edita contacte';
+$labels['addcontact'] = 'Afegeix un nou contacte';
+$labels['editcontact'] = 'Edita el contacte';
 $labels['contacts'] = 'Contactes';
 $labels['contactproperties'] = 'Propietats del contacte';
 $labels['personalinfo'] = 'Informaci籀 personal';
@@ -258,52 +269,54 @@ $labels['edit'] = 'Edita';
 $labels['cancel'] = 'Cancel繚la';
 $labels['save'] = 'Desa';
 $labels['delete'] = 'Suprimeix';
-$labels['rename'] = 'Renombrar';
+$labels['rename'] = 'Reanomena';
 $labels['addphoto'] = 'Afegeix';
 $labels['replacephoto'] = 'Reempla癟a';
-$labels['newcontact'] = 'Crea nou contacte';
-$labels['deletecontact'] = 'Suprimeix contactes seleccionats';
+$labels['uploadphoto'] = 'Puja una fotografia';
+$labels['newcontact'] = 'Crea un nou contacte';
+$labels['deletecontact'] = 'Suprimeix els contactes seleccionats';
 $labels['composeto'] = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
 $labels['print'] = 'Imprimeix';
 $labels['export'] = 'Exporta';
 $labels['exportvcards'] = 'Exporta contactes en format vCard';
 $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
-$labels['grouprename'] = 'Renomena el grup';
-$labels['groupdelete'] = 'Elimina el grup';
-$labels['previouspage'] = 'Mostra anteriors';
-$labels['firstpage'] = 'Mostra primers';
-$labels['nextpage'] = 'Mostra seg羹ents';
-$labels['lastpage'] = 'Mostra darrers';
+$labels['grouprename'] = 'Reanomena el grup';
+$labels['groupdelete'] = 'Suprimeix el grup';
+$labels['groupremoveselected'] = 'Suprimeix els contactes seleccionats del grup';
+$labels['previouspage'] = 'Mostra la p��gina anterior';
+$labels['firstpage'] = 'Mostra la primera p��gina';
+$labels['nextpage'] = 'Mostra la p��gina seg羹ent';
+$labels['lastpage'] = 'Mostra la darrera p��gina';
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grups';
 $labels['personaladrbook'] = 'Llibreta d\'adreces';
 $labels['searchsave'] = 'Desa la cerca';
-$labels['searchdelete'] = 'Elimina la cerca';
+$labels['searchdelete'] = 'Suprimeix la cerca';
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
 $labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reempla癟a la llibreta d\'adre癟es sencera';
-$labels['importtext'] = 'Podeu importar contactes des d\'una llibreta d\'adreces existent.<br/>Actualment suportem l\'importaci籀 d\'adreces amb el format <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
+$labels['importtext'] = 'Podeu importar contactes des d\'una llibreta d\'adreces existent.<br/>Actualment s\'admet l\'importaci籀 d\'adreces amb el format <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Fet';
 $labels['settingsfor'] = 'Configuraci籀 per a';
 $labels['about'] = 'Quant a';
 $labels['preferences'] = 'Prefer癡ncies';
-$labels['userpreferences'] = 'Prefer癡ncies d\'usuari';
-$labels['editpreferences'] = 'Edita prefer癡ncies d\'usuari';
+$labels['userpreferences'] = 'Prefer癡ncies de l\'usuari';
+$labels['editpreferences'] = 'Edita les prefer癡ncies de l\'usuari';
 $labels['identities'] = 'Identitats';
-$labels['manageidentities'] = 'Gestiona identitats per a aquest compte';
+$labels['manageidentities'] = 'Gestiona les identitats per a aquest compte';
 $labels['newidentity'] = 'Nova identitat';
-$labels['newitem'] = 'Nou';
-$labels['edititem'] = 'Edita';
+$labels['newitem'] = 'Nou element';
+$labels['edititem'] = 'Edita l\'element';
 $labels['preferhtml'] = 'Mostra HTML';
-$labels['defaultcharset'] = 'Joc de caracters per defecte';
+$labels['defaultcharset'] = 'Joc de car��cters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
-$labels['setdefault'] = 'Selecciona opci籀 per defecte';
+$labels['setdefault'] = 'Posa-ho per defecte';
 $labels['autodetect'] = 'Auto';
 $labels['language'] = 'Idioma';
 $labels['timezone'] = 'Fus horari';
@@ -311,30 +324,31 @@ $labels['pagesize'] = 'Files per p��gina';
 $labels['signature'] = 'Signatura';
 $labels['dstactive'] = 'Horari d\'estiu';
 $labels['htmleditor'] = 'Escriu missatges en HTML';
-$labels['htmlonreply'] = 'nom矇s en resposta a missatge HTML';
-$labels['htmlsignature'] = 'Signatura HTML';
+$labels['htmlonreply'] = 'nom矇s en resposta a missatges en HTML';
+$labels['htmlsignature'] = 'Signatura en HTML';
 $labels['previewpane'] = 'Mostra el panell de previsualitzaci籀';
 $labels['skin'] = 'Aparen癟a d\'interf穩cie';
-$labels['logoutclear'] = 'Buida la paperera al tancar sessi籀';
-$labels['logoutcompact'] = 'Compacta la safata d\'entrada al tancar sessi籀';
-$labels['uisettings'] = 'Interf穩cie d\'usuari';
+$labels['logoutclear'] = 'Buida la paperera al tancar la sessi籀';
+$labels['logoutcompact'] = 'Compacta la safata d\'entrada al tancar la sessi籀';
+$labels['uisettings'] = 'Interf穩cie de l\'usuari';
 $labels['serversettings'] = 'Configuraci籀 del servidor';
 $labels['mailboxview'] = 'Vista de la b繳stia';
-$labels['mdnrequests'] = 'Notificacions de recepci籀';
-$labels['askuser'] = 'Pregunta-ho a l\'usuari';
-$labels['autosend'] = 'Envia-les autom��ticament';
-$labels['autosendknown'] = 'Envia-les autom��ticament nom矇s als meus contactes';
-$labels['autosendknownignore'] = 'enviar recepci籀 als meus contactes, sin籀 ignora';
-$labels['ignore'] = 'Ignora-les';
+$labels['mdnrequests'] = 'Notificacions de confirmaci籀 de recepci籀';
+$labels['askuser'] = 'demana\'m qu癡 vull fer';
+$labels['autosend'] = 'envia la confirmaci籀 de recepci籀';
+$labels['autosendknown'] = 'envia la confirmaci籀 de recepci籀 als meus contactes, pels dem矇s damana-m\'ho';
+$labels['autosendknownignore'] = 'envia la confirmaci籀 als meus contactes, pels dem矇s ignora-ho';
+$labels['ignore'] = 'ignora';
 $labels['readwhendeleted'] = 'Marca el missatge com a llegit quan se suprimeixi';
-$labels['flagfordeletion'] = 'Afegeix marca d\'esborrat en comptes d\'esborrar-lo';
+$labels['flagfordeletion'] = 'Marca el missatge com a suprimit en comptes de suprimir-lo';
 $labels['skipdeleted'] = 'No mostris els missatges suprimits';
-$labels['deletealways'] = 'Si falla quan es mou un missatge a la Paperera, aleshores esborra\'l';
-$labels['showremoteimages'] = 'Mostra imatges remotes sota el missatge';
+$labels['deletealways'] = 'Si falla quan es mou un missatge a la Paperera, aleshores suprimeix-lo';
+$labels['deletejunk'] = 'Suprimeix directament els missatges de Correu brossa';
+$labels['showremoteimages'] = 'Mostra les imatges remotes del missatge';
 $labels['fromknownsenders'] = 'de remitent conegut';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra les imatges adjuntes sota el missatge';
-$labels['autosavedraft'] = 'Desa esborrany autom��ticament';
+$labels['autosavedraft'] = 'Desa l\'esborrany autom��ticament';
 $labels['everynminutes'] = 'cada $n minut(s)';
 $labels['keepalive'] = 'Comprova nous missatges a';
 $labels['never'] = 'mai';
@@ -345,89 +359,92 @@ $labels['mimeparamfolding'] = 'Noms dels adjunts';
 $labels['2231folding'] = 'Compleix RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Compleix RFC 2047 (un altre)';
-$labels['force7bit'] = 'Fes servir la codificaci籀 MIME per a caracters de 8-bits';
+$labels['force7bit'] = 'Fes servir la codificaci籀 MIME per a car��cters de 8-bits';
 $labels['advancedoptions'] = 'Opcions avan癟ades';
 $labels['focusonnewmessage'] = 'Envia el focus al navegador quan hi hagi un nou missatge';
 $labels['checkallfolders'] = 'Comprova totes les carpetes per missatges nous';
-$labels['displaynext'] = 'Mostra el seg羹ent missatge despr矇s de esborrar-ne o moure\'n un';
-$labels['defaultfont'] = 'Font per defecte al missatge HTML';
+$labels['displaynext'] = 'Mostra el seg羹ent missatge despr矇s de suprimir-ne o moure\'n un';
+$labels['defaultfont'] = 'Font de lletra per defecte de missatge HTML';
 $labels['mainoptions'] = 'Opcions principals';
+$labels['browseroptions'] = 'Opcions del navegador';
 $labels['section'] = 'Secci籀';
 $labels['maintenance'] = 'Manteniment';
 $labels['newmessage'] = 'Missatge nou';
 $labels['signatureoptions'] = 'Opcions de signatura';
 $labels['whenreplying'] = 'Quan es respon';
-$labels['replytopposting'] = 'comen癟a un nou missatge per sobre de l\'original';
-$labels['replybottomposting'] = 'comen癟a un nou missatge per sota de l\'original';
-$labels['replyremovesignature'] = 'Quan es contesti, elimina la signatura original del missatge';
+$labels['replytopposting'] = 'comen癟a el missatge nou per sobre de l\'original';
+$labels['replybottomposting'] = 'comen癟a el missatge nou per sota de l\'original';
+$labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura original del missatge';
 $labels['autoaddsignature'] = 'Afegeix la signatura autom��ticament';
-$labels['newmessageonly'] = 'nom矇s missatge nou';
-$labels['replyandforwardonly'] = 'nom矇s respostes i reenviaments';
-$labels['replysignaturepos'] = 'Quan es contesti o reenvi簿, posa la signatura';
+$labels['newmessageonly'] = 'nom矇s si 矇s un missatge nou';
+$labels['replyandforwardonly'] = 'nom矇s a respostes i reenviaments';
+$labels['replysignaturepos'] = 'Quan es contesti o reenvi簿, posa-hi la signatura';
 $labels['belowquote'] = 'sota les cometes';
 $labels['abovequote'] = 'sobre les cometes';
-$labels['insertsignature'] = 'Inserta signatura';
-$labels['previewpanemarkread'] = 'Marca missatges previsualitzats com a llegits';
+$labels['insertsignature'] = 'Inserta la signatura';
+$labels['previewpanemarkread'] = 'Marca els missatges previsualitzats com a llegits';
 $labels['afternseconds'] = 'despr矇s de $n segons';
 $labels['reqmdn'] = 'Demana sempre la confirmaci籀 de recepci籀';
-$labels['reqdsn'] = 'Sempre demanar una notificaci籀 d\'estat de lliurament';
-$labels['replysamefolder'] = 'Col繚locar respostes a la carpeta del missatge que es respon';
+$labels['reqdsn'] = 'Demana sempre una notificaci籀 d\'estat de lliurament';
+$labels['replysamefolder'] = 'Posa les respostes a la carpeta del missatge que es respon';
 $labels['defaultaddressbook'] = 'Afegeix contactes nous a la llibreta d\'adreces seleccionada';
-$labels['autocompletesingle'] = 'Salta l\'adre癟a de correu alternativa a l\'autocompleci籀';
+$labels['autocompletesingle'] = 'Omet adreces alternatives quan s\'autocompleti';
+$labels['listnamedisplay'] = 'Llista contactes com a';
 $labels['spellcheckbeforesend'] = 'Comprova l\'ortografia abans d\'enviar un missatge';
 $labels['spellcheckoptions'] = 'Opcions del corrector ortogr��fic';
 $labels['spellcheckignoresyms'] = 'Ignora paraules amb s穩mbols';
 $labels['spellcheckignorenums'] = 'Ignora paraules amb n繳meros';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
+$labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enlla癟os mailto:';
 $labels['folder'] = 'Carpeta';
-$labels['foldername'] = 'Nom de carpeta';
-$labels['subscribed'] = 'Subscriure\'s';
+$labels['foldername'] = 'Nom de la carpeta';
+$labels['subscribed'] = 'Subscrit';
 $labels['messagecount'] = 'Missatges';
 $labels['create'] = 'Crea';
-$labels['createfolder'] = 'Crea nova carpeta';
+$labels['createfolder'] = 'Crea una carpeta nova';
 $labels['managefolders'] = 'Gestiona carpetes';
-$labels['specialfolders'] = 'Carpetes Especials';
+$labels['specialfolders'] = 'Carpetes especials';
 $labels['properties'] = 'Propietats';
 $labels['folderproperties'] = 'Propietats de la carpeta';
-$labels['parentfolder'] = 'Carpeta pare';
-$labels['location'] = 'Localitzaci籀';
+$labels['parentfolder'] = 'Carpeta superior';
+$labels['location'] = 'Ubicaci籀';
 $labels['info'] = 'Informaci籀';
-$labels['getfoldersize'] = 'Clica per a veure la mida de la carpeta';
-$labels['changesubscription'] = 'Clica per a canviar la subscripci籀';
+$labels['getfoldersize'] = 'Clica per veure la mida de la carpeta';
+$labels['changesubscription'] = 'Clica per canviar la subscripci籀';
 $labels['foldertype'] = 'Tipus de Carpeta';
-$labels['personalfolder'] = 'Carpeta Privada';
-$labels['otherfolder'] = 'Carpeta d\'un Altre Usuari';
-$labels['sharedfolder'] = 'Carpeta P繳blica';
+$labels['personalfolder'] = 'Carpeta privada';
+$labels['otherfolder'] = 'Carpeta d\'un altre usuari';
+$labels['sharedfolder'] = 'Carpeta p繳blica';
 $labels['sortby'] = 'Ordena per';
 $labels['sortasc'] = 'Ordena ascendentment';
 $labels['sortdesc'] = 'Ordena descendentment';
 $labels['undo'] = 'Desf矇s';
-$labels['plugin'] = 'Connector';
+$labels['plugin'] = 'Complement';
 $labels['version'] = 'Versi籀';
 $labels['source'] = 'Font';
 $labels['license'] = 'Llic癡ncia';
-$labels['support'] = 'Obtenir ajuda';
+$labels['support'] = 'Obtingueu ajuda';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
-$labels['english'] = 'Angl矇s';
-$labels['westerneuropean'] = 'Europeu Occidental';
-$labels['easterneuropean'] = 'Europeu Oriental';
+$labels['english'] = 'Angl癡s';
+$labels['westerneuropean'] = 'Europeu occidental';
+$labels['easterneuropean'] = 'Europeu oriental';
 $labels['southeasterneuropean'] = 'Europeu Sud-Oriental';
 $labels['baltic'] = 'B��ltic';
-$labels['cyrillic'] = 'Cirilic';
+$labels['cyrillic'] = 'Cir穩l繚lic';
 $labels['arabic'] = '��rab';
 $labels['greek'] = 'Grec';
 $labels['hebrew'] = 'Hebreu';
 $labels['turkish'] = 'Turc';
 $labels['nordic'] = 'N簷rdic';
-$labels['thai'] = 'Tailand矇s';
-$labels['celtic'] = 'Celta';
+$labels['thai'] = 'Tailand癡s';
+$labels['celtic'] = 'C癡ltic';
 $labels['vietnamese'] = 'Vietnamita';
-$labels['japanese'] = 'Japon矇s';
-$labels['korean'] = 'Kore��';
-$labels['chinese'] = 'Xin矇s';
+$labels['japanese'] = 'Japon癡s';
+$labels['korean'] = 'Core��';
+$labels['chinese'] = 'Xin癡s';
 
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 441c07da2..c5b036820 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Hi ha hagut un error!';
 $messages['loginfailed'] = 'L\'acc矇s ha fallat.';
 $messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies';
 $messages['sessionerror'] = 'La vostra sessi籀 no existeix o ha expirat';
@@ -22,137 +22,139 @@ $messages['storageerror'] = 'Error de conexi籀 amb el servidor IMAP';
 $messages['servererror'] = 'Error del Servidor!';
 $messages['servererrormsg'] = 'Error del Servidor: $msg';
 $messages['dberror'] = 'Error a la Base de Dades!';
-$messages['errorreadonly'] = 'Impossible de realitzar l\'operaci籀. La carpeta 矇s de nom矇s lectura';
-$messages['errornoperm'] = 'Impossible de realitzar l\'operaci籀. Perm穩s denegat';
+$messages['requesttimedout'] = 'S\'ha esgotat el temps de la sol繚licitud';
+$messages['errorreadonly'] = 'Impossible de realitzar l\'operaci籀. La carpeta 矇s de nom矇s lectura.';
+$messages['errornoperm'] = 'Impossible de realitzar l\'operaci籀. Perm穩s denegat.';
 $messages['invalidrequest'] = 'Petici籀 no v��lida! No s\'ha desat les dades.';
-$messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta b繳stia';
-$messages['loggedout'] = 'Heu tancat la sessi籀. Fins aviat!';
-$messages['mailboxempty'] = 'La b繳stia 矇s buida';
-$messages['loading'] = 'Carregant...';
-$messages['uploading'] = 'Pujant fitxer...';
-$messages['uploadingmany'] = 'Pujant fitxers...';
-$messages['loadingdata'] = 'Carregant dades...';
-$messages['checkingmail'] = 'Cercant nous missatges...';
-$messages['sendingmessage'] = 'Enviant missatge...';
-$messages['messagesent'] = 'Missatge enviat correctament';
+$messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta b繳stia.';
+$messages['loggedout'] = 'Heu tancat la sessi籀. A reveure!';
+$messages['mailboxempty'] = 'La b繳stia 矇s buida.';
+$messages['loading'] = 'S\'est�� carregant���';
+$messages['uploading'] = 'S\'est�� pujant el fitxer...';
+$messages['uploadingmany'] = 'S\'est�� pujant els fitxers...';
+$messages['loadingdata'] = 'S\'estan carregant les dades...';
+$messages['checkingmail'] = 'S���est�� comprovant si hi ha missatges nous���';
+$messages['sendingmessage'] = 'S���est�� enviant el missatge���';
+$messages['messagesent'] = 'Missatge enviat correctament.';
 $messages['savingmessage'] = 'Desant missatge...';
-$messages['messagesaved'] = 'Missatge desat a Esborranys';
-$messages['successfullysaved'] = 'Desat correctament';
-$messages['addedsuccessfully'] = 'Contacte afegit correctament a la llibreta d\'adreces';
-$messages['contactexists'] = 'Ja hi ha un contacte amb aquesta adre癟a de correu';
+$messages['messagesaved'] = 'Missatge desat a Esborranys.';
+$messages['successfullysaved'] = 'Desat correctament.';
+$messages['addedsuccessfully'] = 'Contacte afegit correctament a la llibreta d\'adreces.';
+$messages['contactexists'] = 'Ja hi ha un contacte amb aquesta adre癟a de correu.';
 $messages['contactnameexists'] = 'Ja existeix un contacte amb el mateix nom.';
-$messages['blockedimages'] = 'Per a protegir la vostra privacitat, les imatges remotes han estat bloquejades en aquest missatge';
+$messages['blockedimages'] = 'Per protegir la vostra privacitat, les imatges remotes han estat 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['contactnotfound'] = 'No s\'ha trobat el contacte sol繚licitat';
-$messages['contactsearchonly'] = 'Introdueix termes de cerca per a trobar contactes';
-$messages['sendingfailed'] = 'Error enviant missatge';
-$messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge';
-$messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat';
-$messages['errorsaving'] = 'Hi ha hagut un error mentre es desava';
-$messages['errormoving'] = 'No s\'ha pogut moure el missatge';
-$messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s)';
-$messages['errordeleting'] = 'No s\'ha pogut eliminar el missatge';
-$messages['errormarking'] = 'No s\'ha pogut marcar el missatge.';
+$messages['nocontactsfound'] = 'No s\'ha trobat cap contacte.';
+$messages['contactnotfound'] = 'No s\'ha trobat el contacte sol繚licitat.';
+$messages['contactsearchonly'] = 'Introdu簿u termes de cerca per trobar contactes';
+$messages['sendingfailed'] = 'Error enviant missatge.';
+$messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.';
+$messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat.';
+$messages['errorsaving'] = 'Hi ha hagut un error mentre es desava.';
+$messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).';
+$messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).';
+$messages['errordeleting'] = 'No s\'ha pogut suprimir el missatge.';
+$messages['errormarking'] = 'No s\'ha pogut marcar el(s) missatge(s).';
 $messages['deletecontactconfirm'] = 'Esteu segurs de voler suprimir el(s) contacte(s) selecionat(s)?';
-$messages['deletegroupconfirm'] = 'De veres voleu eliminar el grup seleccionat?';
+$messages['deletegroupconfirm'] = 'Esteu segurs de voler suprimirr el grup seleccionat?';
 $messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
 $messages['deletefolderconfirm'] = 'Esteu segurs de voler suprimir aquesta carpeta?';
 $messages['purgefolderconfirm'] = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
-$messages['contactdeleting'] = 'Esborrant contacte(s)...';
-$messages['groupdeleting'] = 'Eliminant el grup...';
-$messages['folderdeleting'] = 'Suprimint la carpeta...';
-$messages['foldermoving'] = 'Movent la carpeta...';
-$messages['foldersubscribing'] = 'Subscribint la carpeta...';
-$messages['folderunsubscribing'] = 'Desubscribint la carpeta...';
-$messages['formincomplete'] = 'El formulari no ha sigut emplenat totalment';
-$messages['noemailwarning'] = 'Introdu簿u una adre癟a d\'e-mail v��lida';
-$messages['nonamewarning'] = 'Introdu簿u un nom';
-$messages['nopagesizewarning'] = 'Introdu簿u una mida de p��gina';
-$messages['nosenderwarning'] = 'Si us plau, entreu l\'adre癟a d\'e-mail del remitent';
-$messages['norecipientwarning'] = 'Introdu簿u com a m穩nim un destinatari';
+$messages['contactdeleting'] = 'S\'est�� suprimint els contacte(s)...';
+$messages['groupdeleting'] = 'S\'est�� suprimint el grup...';
+$messages['folderdeleting'] = 'S\'est�� suprimint la carpeta...';
+$messages['foldermoving'] = 'S\'est�� movent la carpeta...';
+$messages['foldersubscribing'] = 'S\'est�� subscribint la carpeta...';
+$messages['folderunsubscribing'] = 'S\'est�� cancelant la subscripci籀 de la carpeta...';
+$messages['formincomplete'] = 'El formulari no ha estat emplenat totalment.';
+$messages['noemailwarning'] = 'Si us plau, introdu簿u una adre癟a de correu electr簷nic v��lida.';
+$messages['nonamewarning'] = 'Si us plau, introdu簿u un nom.';
+$messages['nopagesizewarning'] = 'Si us plau, introdu簿u una mida de p��gina.';
+$messages['nosenderwarning'] = 'Si us plau, entreu l\'adre癟a de correu del remitent.';
+$messages['norecipientwarning'] = 'Si us plau, introdu簿u com a m穩nim un destinatari.';
 $messages['nosubjectwarning'] = 'El camp "Assumpte" 矇s buit. Voleu introduir-ne un ara?';
 $messages['nobodywarning'] = 'Voleu enviar aquest missatge sense text?';
 $messages['notsentwarning'] = 'El missatge no s\'ha enviat. Voleu descartar el vostre missatge?';
-$messages['noldapserver'] = 'Seleccioneu un servidor LDAP per a cercar';
-$messages['nosearchname'] = 'Introdu簿u un nom de contacte o una adre癟a e-mail';
+$messages['noldapserver'] = 'Si us plau, seleccioneu un servidor LDAP per cercar.';
+$messages['nosearchname'] = 'Si us plau, introdu簿u un nom de contacte o una adre癟a de correu.';
 $messages['notuploadedwarning'] = 'Encara no s\'han pujat tots els adjunts. Si us plau, espereu o cancel繚leu la pujada.';
-$messages['searchsuccessful'] = '$nr missatges trobats';
-$messages['contactsearchsuccessful'] = '$nr contactes trobats';
-$messages['searchnomatch'] = 'No s\'ha trobat cap coincid癡ncia';
-$messages['searching'] = 'Cercant...';
-$messages['checking'] = 'Comprovant...';
-$messages['nospellerrors'] = 'No s\'han trobat errors d\'ortografia';
-$messages['folderdeleted'] = 'Carpeta eliminada correctament';
-$messages['foldersubscribed'] = 'Carpeta subscrita correctament';
-$messages['folderunsubscribed'] = 'Carpeta desubscrita correctament';
-$messages['folderpurged'] = 'La carpeta ha estat buidada satisfact簷riament';
-$messages['folderexpunged'] = 'La carpeta ha estat compactada satisfact簷riament';
-$messages['deletedsuccessfully'] = 'Eliminat correctament';
-$messages['converting'] = 'Traient format del missatge...';
-$messages['messageopenerror'] = 'No s\'ha pogut carregar el missatge del servidor';
-$messages['fileuploaderror'] = 'La pujada del fitxer ha fallat';
-$messages['filesizeerror'] = 'El fitxer pujat excedeix la grand��ria m��xima de $size';
-$messages['copysuccess'] = 'S\'han copiat $nr adreces correctament';
-$messages['copyerror'] = 'No s\'ha pogut copiar cap adre癟a';
-$messages['sourceisreadonly'] = 'Aquesta adre癟a 矇s nom矇s de lectura';
-$messages['errorsavingcontact'] = 'No s\'ha pogut desar l\'adre癟a de contacte';
-$messages['movingmessage'] = 'Movent el missatge...';
-$messages['copyingmessage'] = 'Copiant missatge...';
-$messages['copyingcontact'] = 'Copiant contacte(s)...';
-$messages['deletingmessage'] = 'Esborrant missatge(s)...';
-$messages['markingmessage'] = 'Marcant missatge(s)...';
-$messages['addingmember'] = 'Afegint contacte(s) al grup...';
-$messages['removingmember'] = 'Eliminant contacte(s) del grup';
-$messages['receiptsent'] = 'Confirmaci籀 de lectura enviada satisfact簷riament';
-$messages['errorsendingreceipt'] = 'No es pot enviar la confirmaci籀';
+$messages['searchsuccessful'] = '$nr missatges trobats.';
+$messages['contactsearchsuccessful'] = '$nr contactes trobats.';
+$messages['searchnomatch'] = 'No s\'ha trobat cap coincid癡ncia.';
+$messages['searching'] = 'S\'est�� cercant...';
+$messages['checking'] = 'S\'est�� comprovant...';
+$messages['nospellerrors'] = 'No s\'han trobat errors d\'ortografia.';
+$messages['folderdeleted'] = 'Carpeta suprimida correctament.';
+$messages['foldersubscribed'] = 'Carpeta subscrita correctament.';
+$messages['folderunsubscribed'] = 'Carpeta desubscrita correctament.';
+$messages['folderpurged'] = 'La carpeta ha estat buidada correctament.';
+$messages['folderexpunged'] = 'La carpeta ha estat compactada correctament.';
+$messages['deletedsuccessfully'] = 'Suprimit correctament.';
+$messages['converting'] = 'S\'est�� traient format del missatge...';
+$messages['messageopenerror'] = 'No s\'ha pogut carregar el missatge del servidor.';
+$messages['fileuploaderror'] = 'La pujada del fitxer ha fallat.';
+$messages['filesizeerror'] = 'El fitxer pujat excedeix la mida m��xima de $size.';
+$messages['copysuccess'] = 'S\'han copiat $nr adreces correctament.';
+$messages['copyerror'] = 'No s\'ha pogut copiar cap adre癟a.';
+$messages['sourceisreadonly'] = 'Aquesta adre癟a 矇s nom矇s de lectura.';
+$messages['errorsavingcontact'] = 'No s\'ha pogut desar l\'adre癟a de contacte.';
+$messages['movingmessage'] = 'S\'est�� movent el missatge...';
+$messages['copyingmessage'] = 'S\'est�� copiant missatge...';
+$messages['copyingcontact'] = 'S\'est�� copiant els contacte(s)...';
+$messages['deletingmessage'] = 'S\'est�� suprimint els missatge(s)...';
+$messages['markingmessage'] = 'S\'est�� marcant els missatge(s)...';
+$messages['addingmember'] = 'S\'est�� afegint els contacte(s) al grup...';
+$messages['removingmember'] = 'S\'est�� suprimint els contacte(s) del grup...';
+$messages['receiptsent'] = 'Confirmaci籀 de lectura enviada correctament.';
+$messages['errorsendingreceipt'] = 'No es pot enviar la confirmaci籀.';
+$messages['deleteidentityconfirm'] = 'Esteu segurs de voler suprimir aquesta identitat?';
 $messages['nodeletelastidentity'] = 'No podeu suprimir aquesta identitat, 矇s l\'繳ltima.';
-$messages['forbiddencharacter'] = 'El nom de carpeta cont矇 un car��cter prohibit';
-$messages['selectimportfile'] = 'Si us plau, seleccioneu un fitxer per pujar';
-$messages['addresswriterror'] = 'La llibreta d\'adreces seleccionada no 矇s modificable';
-$messages['contactaddedtogroup'] = 'S\'han afegit correctament els contactes a aquest grup';
-$messages['contactremovedfromgroup'] = 'S\'han suprimit correctament els contactes d\'aquest grup';
+$messages['forbiddencharacter'] = 'El nom de carpeta cont矇 un car��cter no perm癡s.';
+$messages['selectimportfile'] = 'Si us plau, seleccioneu un fitxer per pujar.';
+$messages['addresswriterror'] = 'La llibreta d\'adreces seleccionada no 矇s modificable.';
+$messages['contactaddedtogroup'] = 'S\'han afegit correctament els contactes a aquest grup.';
+$messages['contactremovedfromgroup'] = 'S\'han suprimit correctament els contactes d\'aquest grup.';
 $messages['importwait'] = 'S\'est�� important, espereu si us plau...';
-$messages['importerror'] = 'La importaci籀 ha fallt! El fitxer pujat no 矇s un fitxer vCard v��lid';
-$messages['importconfirm'] = '<b>S\'han importat $inserted contactes satisfact簷riament, s\'han descartat $skipped entrades ja existents</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Saltades $skipped entrades existents</b>';
+$messages['importerror'] = 'La importaci籀 ha fallat! El fitxer pujat no 矇s un fitxer vCard v��lid.';
+$messages['importconfirm'] = '<b>S\'han importat $inserted contactes correctament</b>';
+$messages['importconfirmskipped'] = '<b>S\'han descartat $skipped entrades ja existents</b>';
 $messages['opnotpermitted'] = 'Operaci籀 no permesa!';
-$messages['nofromaddress'] = 'Falta l\'adre癟a d\'e-mail a la identitat seleccionada';
+$messages['nofromaddress'] = 'Falta l\'adre癟a de correu a la identitat seleccionada.';
 $messages['editorwarning'] = 'Si canvieu a l\'editor de text pla perdreu tot el format del text. Voleu continuar?';
 $messages['httpreceivedencrypterror'] = 'Hi ha hagut un error fatal de configuraci籀. Contacteu amb el vostre administrador immediatament. <b>El vostre missatge no pot ser enviat.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): La connexi籀 al servidor ha fallat.';
 $messages['smtpautherror'] = 'Error SMTP ($code): La identificaci籀 ha fallat.';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg)';
-$messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg)';
-$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg).';
+$messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg).';
+$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris.';
 $messages['smtperror'] = 'Error SMTP: $msg';
-$messages['emailformaterror'] = 'Adre癟a d\'e-mail incorrecta: $email';
+$messages['emailformaterror'] = 'Adre癟a de correu no v��lida: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Redu簿u el nombre de destinataris a $max.';
 $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el m��xim de $max.';
-$messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar';
-$messages['contactdelerror'] = 'No s\'ha pogut esborrar el(s) contacte(s)';
-$messages['contactdeleted'] = 'Contacte(s) esborrat(s) satisfact簷riament';
-$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) eliminat(s).';
+$messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar.';
+$messages['contactdelerror'] = 'No s\'ha pogut suprimir el(s) contacte(s).';
+$messages['contactdeleted'] = 'Contacte(s) suprimits(s) correctament.';
+$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimits(s).';
 $messages['contactrestored'] = 'Contacte(s) restaurats correctament.';
-$messages['groupdeleted'] = 'Grup esborrat satisfact簷riament';
-$messages['grouprenamed'] = 'Grup renombrat satisfact簷riament';
-$messages['groupcreated'] = 'Grup creat satisfact簷riament';
-$messages['savedsearchdeleted'] = 'S\'ha eliminat correctament la cerca desada.';
-$messages['savedsearchdeleteerror'] = 'No s\'ha pogut eliminar la cerca desada.';
+$messages['groupdeleted'] = 'Grup suprimit correctament.';
+$messages['grouprenamed'] = 'Grup reanomenat correctament.';
+$messages['groupcreated'] = 'Grup creat correctament.';
+$messages['savedsearchdeleted'] = 'S\'ha suprimit correctament la cerca desada.';
+$messages['savedsearchdeleteerror'] = 'No s\'ha pogut suprimit la cerca desada.';
 $messages['savedsearchcreated'] = 'S\'ha creat correctament la cerca desada.';
 $messages['savedsearchcreateerror'] = 'No s\'ha pogut crear la cerca desada.';
-$messages['messagedeleted'] = 'Missatge(s) esborrat(s) satisfact簷riament';
-$messages['messagemoved'] = 'Missatge(s) mogut(s) satisfact簷riament';
-$messages['messagecopied'] = 'Missatge(s) copiat(s) satisfact簷riament';
-$messages['messagemarked'] = 'Missatge(s) marcat(s) satisfact簷riament';
-$messages['autocompletechars'] = 'Introdueix al menys $min caracters per a l\'autocompleci籀';
-$messages['autocompletemore'] = 'S癒han trobat m矇s entrades coincidents. Si us plau, introdueix m矇s car��cters.';
-$messages['namecannotbeempty'] = 'El nom no pot estar buit';
-$messages['nametoolong'] = 'El nom 矇s massa llarg';
-$messages['folderupdated'] = 'La carpeta ha estat actualitzada satisfact簷riament';
-$messages['foldercreated'] = 'La carpeta ha estat creada satisfact簷riament';
+$messages['messagedeleted'] = 'Missatge(s) suprimits(s) correctament.';
+$messages['messagemoved'] = 'Missatge(s) mogut(s) correctament.';
+$messages['messagecopied'] = 'Missatge(s) copiat(s) correctament.';
+$messages['messagemarked'] = 'Missatge(s) marcat(s) correctament.';
+$messages['autocompletechars'] = 'Introdu簿u com a m穩nim $min car��cters per l\'autocompleci籀.';
+$messages['autocompletemore'] = 'S\'han trobat m矇s entrades coincidents. Si us plau, introdu簿u m矇s car��cters.';
+$messages['namecannotbeempty'] = 'El nom no pot estar buit.';
+$messages['nametoolong'] = 'El nom 矇s massa llarg.';
+$messages['folderupdated'] = 'La carpeta ha estat actualitzada correctament.';
+$messages['foldercreated'] = 'La carpeta ha estat creada correctament.';
 $messages['invalidimageformat'] = 'No 矇s un format d\'imatge v��lid.';
 $messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al misstage.';
-$messages['parentnotwritable'] = 'No ha etsat possible crear/moure la carpeta dins de la carpeta ascendent seleccionada. No hi ha permisos d\'escriptura.';
-$messages['messagetoobig'] = 'La part del missatge 矇s massa gran per a processar-la.';
+$messages['parentnotwritable'] = 'No s\'ha pogut crear/moure la carpeta dins de la carpeta ascendent seleccionada. No hi ha permisos d\'escriptura.';
+$messages['messagetoobig'] = 'La part del missatge 矇s massa gran per processar-la.';
 
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index dcb82ef12..0335c62a1 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tom獺禳 Bittner <tbittner@itoutsourcing.cz>                   |
+ | Author: Tom獺禳 Kyzlink                                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'P��ipojen穩 na IMAP server selhalo';
 $messages['servererror'] = 'Chyba serveru!';
 $messages['servererrormsg'] = 'Chyba serveru: $msg';
 $messages['dberror'] = 'Chyba v datab獺zi!';
+$messages['requesttimedout'] = 'Do禳lo k vypr禳en穩 po鱉adavku';
 $messages['errorreadonly'] = 'P��穩kaz nelze prov矇st, slo鱉ka je ur��ena jen ke ��ten穩.';
 $messages['errornoperm'] = 'P��穩kaz nelze prov矇st, nem獺te opr獺vn��n穩.';
 $messages['invalidrequest'] = 'Nespr獺vn羸 po鱉adavek. Data nebyla ulo鱉ena.';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 547b9bafa..72ef6a2cf 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
+ | Author: Dafydd Tomos                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Methwyd cysylltu a\'r gweinydd IMAP';
 $messages['servererror'] = 'Gwall Gweinydd!';
 $messages['servererrormsg'] = 'Gwall Gweinydd: $msg';
 $messages['dberror'] = 'Gwall Cronfa Ddata!';
+$messages['requesttimedout'] = 'Cais wedi dod i derfyn amser';
 $messages['errorreadonly'] = 'Methwyd gweithredu. Mae\'r ffolder yn darllen-yn-unig';
 $messages['errornoperm'] = 'Methwyd gweithredu. Gwrthodwyd caniatad';
 $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 602df50c6..bb9038fe6 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Johannes Hessellund <osos@openeyes.dk>                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Forbindelse til e-mailserveren fejlede.';
 $messages['servererror'] = 'Server fejl!';
 $messages['servererrormsg'] = 'Server fejl: $msg';
 $messages['dberror'] = 'Database fejl!';
+$messages['requesttimedout'] = 'Foresp繪rgselstiden udl繪b';
 $messages['errorreadonly'] = 'Kunne ikke udf繪re den 繪nskede handling. Mappen er skrivebeskyttet.';
 $messages['errornoperm'] = 'Kunne ikke udf繪re den 繪nskede handling. Adgang n疆gtet.';
 $messages['invalidrequest'] = 'Ugyldig foresp繪rgsel! Ingen data blev gemt.';
@@ -38,7 +38,7 @@ $messages['sendingmessage'] = 'Sender besked...';
 $messages['messagesent'] = 'Beskeden blev afsendt succesfuldt.';
 $messages['savingmessage'] = 'Gemmer besked...';
 $messages['messagesaved'] = 'Beskeden er gemt i kladdemappen.';
-$messages['successfullysaved'] = 'Beskeden er gemt.';
+$messages['successfullysaved'] = 'Gemt succesfuldt';
 $messages['addedsuccessfully'] = 'Kontakten blev tilf繪jet adressebogen.';
 $messages['contactexists'] = 'Der er allerede en kontakt med denne e-mailadresse.';
 $messages['contactnameexists'] = 'En kontakt med samme navn eksisterer allerede.';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 7ff3ae782..4164e0333 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -120,8 +119,8 @@ $labels['mark'] = 'Markieren';
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
-$labels['markflagged'] = 'Stern hinzuf羹gen';
-$labels['markunflagged'] = 'Stern entfernen';
+$labels['markflagged'] = 'Markierung hinzuf羹gen';
+$labels['markunflagged'] = 'Markierung entfernen';
 $labels['moreactions'] = 'Mehr ...';
 $labels['more'] = 'Mehr';
 $labels['back'] = 'Zur羹ck';
@@ -344,6 +343,7 @@ $labels['readwhendeleted'] = 'Beim L繹schen als gelesen markieren';
 $labels['flagfordeletion'] = 'Als gel繹scht markieren anstatt in den Papierkorb verschieben';
 $labels['skipdeleted'] = 'Zeige keine gel繹schten Nachrichten an';
 $labels['deletealways'] = 'L繹schen wenn Verschieben in den Papierkorb nicht m繹glich';
+$labels['deletejunk'] = 'Nachrichten in Spam direkt l繹schen';
 $labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
 $labels['fromknownsenders'] = 'bei bekannten Absendern';
 $labels['always'] = 'immer';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 470af7d7b..71d5b80f2 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -120,8 +119,8 @@ $labels['mark'] = 'Markieren';
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
-$labels['markflagged'] = 'Stern hinzuf羹gen';
-$labels['markunflagged'] = 'Stern entfernen';
+$labels['markflagged'] = 'Markierung hinzuf羹gen';
+$labels['markunflagged'] = 'Markierung entfernen';
 $labels['moreactions'] = 'Mehr...';
 $labels['more'] = 'Mehr';
 $labels['back'] = 'Zur羹ck';
@@ -344,6 +343,7 @@ $labels['readwhendeleted'] = 'Beim L繹schen als gelesen markieren';
 $labels['flagfordeletion'] = 'Als gel繹scht markieren anstatt in den Papierkorb verschieben';
 $labels['skipdeleted'] = 'Zeige keine gel繹schten Nachrichten an';
 $labels['deletealways'] = 'Wenn verschieben in den Papierkorb fehlschl瓣gt, Nachricht l繹schen';
+$labels['deletejunk'] = 'Nachrichten in Spam direkt l繹schen';
 $labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
 $labels['fromknownsenders'] = 'bei bekannten Absendern';
 $labels['always'] = 'immer';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 6a4bc213b..d8b78d6c8 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Steven Beer <Unknown>                                         |
+ | Author: akn                                                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -19,9 +18,11 @@ $messages['errortitle'] = 'Ein Fehler ist aufgetreten!';
 $messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
 $messages['sessionerror'] = 'Ihre Sitzung ist ung羹ltig oder abgelaufen.';
+$messages['storageerror'] = 'Verbindung zum Speicherserver fehlgeschlagen.';
 $messages['servererror'] = 'Serverfehler!';
 $messages['servererrormsg'] = 'Serverfehler: $msg';
 $messages['dberror'] = 'Datenbankfehler!';
+$messages['requesttimedout'] = 'Zeit羹berschreitung der Anforderung';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgef羹hrt werden. Der Ordner ist schreibgesch羹tzt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgef羹hrt werden. Zugriff verweigert.';
 $messages['invalidrequest'] = 'Ung羹ltige Anfrage! Es wurden keine Daten gespeichert.';
@@ -34,15 +35,15 @@ $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
 $messages['checkingmail'] = '��berpr羹fung auf neue Nachrichten...';
 $messages['sendingmessage'] = 'Nachricht wird gesendet...';
-$messages['messagesent'] = 'Nachricht erfolgreich gesendet';
+$messages['messagesent'] = 'Nachricht erfolgreich gesendet.';
 $messages['savingmessage'] = 'Nachricht wird gespeichert...';
-$messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
+$messages['messagesaved'] = 'Nachricht als Entwurf gespeichert.';
 $messages['successfullysaved'] = 'Erfolgreich gespeichert.';
 $messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugef羹gt.';
 $messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
-$messages['contactnameexists'] = 'Ein Kontakt mit demselben Namen existiert bereits.';
+$messages['contactnameexists'] = 'Ein Kontakt mit dem gleichen Namen existiert bereits.';
 $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 angezeigtwerden.';
+$messages['encryptedmessage'] = 'Dies ist eine verschl羹sselte Nachricht und kann leider nicht angezeigt werden.';
 $messages['nocontactsfound'] = 'Keine Kontakte gefunden.';
 $messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden.';
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden.';
@@ -113,7 +114,6 @@ $messages['selectimportfile'] = 'Bitte w瓣hlen Sie eine Datei zum Importieren au
 $messages['addresswriterror'] = 'Das gew瓣hlte Adressbuch kann nicht ver瓣ndert werden.';
 $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugef羹gt.';
 $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
-$messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung ver瓣ndert.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
 $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index ea6456045..cb9c25c97 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Lazlo                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -41,6 +40,7 @@ $labels['size'] = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Company';
 $labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Folders';
 $labels['folders'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
@@ -272,6 +272,7 @@ $labels['delete'] = 'Delete';
 $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact'] = 'Create new contact card';
 $labels['deletecontact'] = 'Delete selected contacts';
 $labels['composeto'] = 'Compose mail to';
@@ -282,6 +283,7 @@ $labels['exportvcards'] = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
 $labels['grouprename'] = 'Rename group';
 $labels['groupdelete'] = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage'] = 'Show previous set';
 $labels['firstpage'] = 'Show first set';
 $labels['nextpage'] = 'Show next set';
@@ -364,6 +366,7 @@ $labels['checkallfolders'] = 'Check all folders for new messages';
 $labels['displaynext'] = 'After message delete/move display the next message';
 $labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'New Message';
@@ -386,12 +389,14 @@ $labels['reqdsn'] = 'Always request a delivery status notification';
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
 $labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
 $labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
 $labels['spellcheckoptions'] = 'Spellcheck Options';
 $labels['spellcheckignoresyms'] = 'Ignore words with symbols';
 $labels['spellcheckignorenums'] = 'Ignore words with numbers';
 $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised';
 $labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
 $labels['folder'] = 'Folder';
 $labels['foldername'] = 'Folder name';
 $labels['subscribed'] = 'Subscribed';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index a5b1f3126..daa44d1bb 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Kevin Beynon                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'An error occured.';
 $messages['loginfailed'] = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or has expired.';
@@ -22,6 +22,7 @@ $messages['storageerror'] = 'Connection to IMAP server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'Database Error!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 22347a8cf..bea8df9bd 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andreas van Cranenburgh <andreas@unstable.nl>                 |
+ | Author: Kristjan SCHMIDT                                              |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -84,7 +83,7 @@ $labels['nov'] = 'Nov';
 $labels['dec'] = 'Dec';
 $labels['longjan'] = 'Januaro';
 $labels['longfeb'] = 'Februaro';
-$labels['longmar'] = 'Mar��o';
+$labels['longmar'] = 'Marto';
 $labels['longapr'] = 'Aprilo';
 $labels['longjun'] = 'Junio';
 $labels['longjul'] = 'Julio';
@@ -115,9 +114,9 @@ $labels['firstmessage'] = 'Montru unuan mesa��on';
 $labels['nextmessage'] = 'Montru sekvan mesa��on';
 $labels['lastmessage'] = 'Montru lastan mesa��on';
 $labels['backtolist'] = 'Reen al mesa��o-listo';
-$labels['viewsource'] = 'Montru fonton';
-$labels['mark'] = 'Marku';
-$labels['markmessages'] = 'Marku mesa��ojn';
+$labels['viewsource'] = 'Montri fonton';
+$labels['mark'] = 'Marki';
+$labels['markmessages'] = 'Marki mesa��ojn';
 $labels['markread'] = 'Kiel legita';
 $labels['markunread'] = 'Kiel nelegita';
 $labels['markflagged'] = 'kiel markita';
@@ -179,6 +178,7 @@ $labels['dsn'] = 'Ricev-status-konfirmo';
 $labels['mailreplyintro'] = 'Je $date, $sender skribis:';
 $labels['originalmessage'] = 'Originala mesa��o';
 $labels['editidents'] = 'Redaktu identojn';
+$labels['spellcheck'] = 'Literumu';
 $labels['checkspelling'] = 'Kontrolu literumadon';
 $labels['resumeediting'] = 'Rekomencu redaktadon';
 $labels['revertto'] = 'Reiru al';
@@ -242,6 +242,7 @@ $labels['spouse'] = 'Edz(in)o';
 $labels['allfields'] = '��iuj kampoj';
 $labels['search'] = 'Ser��u';
 $labels['advsearch'] = 'Detala serc繫';
+$labels['advanced'] = 'Altnivela';
 $labels['other'] = 'Alia';
 $labels['typeother'] = 'Alia';
 $labels['typehome'] = 'Hejmo';
@@ -262,7 +263,7 @@ $labels['contacts'] = 'Kontaktoj';
 $labels['contactproperties'] = 'Kontakt-informoj';
 $labels['personalinfo'] = 'Personaj informoj';
 $labels['edit'] = 'Redaktu';
-$labels['cancel'] = 'Rezignu';
+$labels['cancel'] = 'Nuligi';
 $labels['save'] = 'Konservi';
 $labels['delete'] = 'Forigi';
 $labels['rename'] = 'Alinomigu';
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index ffaeb6fc7..038249fb0 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Andreas van Cranenburgh <andreas@unstable.nl>                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Konekto kun IMAP-servilo malsukcesis';
 $messages['servererror'] = 'Servil-eraro!';
 $messages['servererrormsg'] = 'Servil-eraro: $msg';
 $messages['dberror'] = 'Datumbaz-eraro!';
+$messages['errorreadonly'] = 'Ne povis fari agon. Dosierujo estas nurlega';
 $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
 $messages['invalidrequest'] = 'Nevalida peto';
 $messages['nomessagesfound'] = 'Neniu mesa��o en ��i tiu dosierujo';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 3163283b4..7425dd7b8 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Juan Pablo <Unknown>                                          |
+ | Author: Jorge L籀pez <jorge@adobo.org>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -212,7 +211,7 @@ $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando u
 $labels['receiptread'] = 'Notificaci籀n de lectura';
 $labels['yourmessage'] = 'Esto es un acuse de recibo de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificaci籀n s籀lo significa que su mensaje fue abierto en el ordenador del destinatario. Eso no garantiza que el destinatario haya le穩do o entendido el contenido del mensaje.';
-$labels['name'] = 'Mostra nombre';
+$labels['name'] = 'Nombre para mostrar';
 $labels['firstname'] = 'Nombre';
 $labels['surname'] = 'Apellido';
 $labels['middlename'] = 'Segundo nombre';
@@ -234,7 +233,7 @@ $labels['country'] = 'Pa穩s';
 $labels['birthday'] = 'Cumplea簽os';
 $labels['anniversary'] = 'Santo';
 $labels['website'] = 'P獺gina web';
-$labels['instantmessenger'] = 'Instant Messenger';
+$labels['instantmessenger'] = 'Mensajer穩a instant獺nea';
 $labels['notes'] = 'Notas';
 $labels['male'] = 'Hombre';
 $labels['female'] = 'Mujer';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index d58407fa2..186554ff7 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David Marzal <Unknown>                                        |
+ | Author: pompilos <ciordia@gmail.com>                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Error de conexi籀n con el servidor IMAP';
 $messages['servererror'] = '癒Error del servidor!';
 $messages['servererrormsg'] = 'Error de servidor: $msg';
 $messages['dberror'] = '癒Error de base de datos!';
+$messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'No se ha podido hacer. La bandeja es s籀lo de lectura';
 $messages['errornoperm'] = 'Imposible realizar la operaci籀n. Permiso denegado';
 $messages['invalidrequest'] = '癒Petici籀n no v獺lida! No se han guardado los datos.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index c9a9fcd19..3b7c1300b 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar <Unknown>                                               |
+ | Author: yllar                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -272,6 +271,7 @@ $labels['delete'] = 'Kustuta';
 $labels['rename'] = 'Nimeta 羹mber';
 $labels['addphoto'] = 'Lisa';
 $labels['replacephoto'] = 'Asenda';
+$labels['uploadphoto'] = 'Lisa foto';
 $labels['newcontact'] = 'Uue sissekande loomine';
 $labels['deletecontact'] = 'Kustuta m瓣rgistatud kontaktid';
 $labels['composeto'] = 'Kirjuta kiri';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 3c516f847..4248dbae6 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Asier Iturralde Sarasola <Unknown>                            |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -38,7 +37,6 @@ $labels['replyto'] = 'Erantzun-Honi';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamaina';
 $labels['priority'] = 'Lehentasuna';
-$labels['organization'] = 'Erakundea';
 $labels['mailboxlist'] = 'Karpetak';
 $labels['folders'] = 'Karpetak';
 $labels['messagesfromto'] = '$from -tik $to -ra $count mezuetatik';
@@ -110,8 +108,8 @@ $labels['markflagged'] = 'Markatua bezala';
 $labels['markunflagged'] = 'Ez-markatua bezala';
 $labels['select'] = 'Hautatu';
 $labels['all'] = 'Denak';
-$labels['none'] = 'Bat ere ez';
-$labels['nonesort'] = 'Bat ere ez';
+$labels['none'] = 'Batez';
+$labels['nonesort'] = 'Batez';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index f505ef7ec..2489676da 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Hamid <abbaszadeh.h@gmail.com>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = '塈堛媯塈�� 堥�� 堻堭��堭 塈��堥塈堭�� ��塈��������
 $messages['servererror'] = '堮媟塈�� 堻堭��堭!';
 $messages['servererrormsg'] = '堮媟塈�� 堻堭��堭: $msg';
 $messages['dberror'] = '堮媟塈�� 椈塈��痧塈�����堹塈堹��';
+$messages['requesttimedout'] = '堬��塈�� 堹堭堮��塈堻堛 堛��塈�� 奡堹';
 $messages['errorreadonly'] = '��塈堛��塈���� 堹堭 塈��堿塈�� 媢������塈堛. 椈��奡�� ����媟 堮��塈��堹���� 塈堻堛.';
 $messages['errornoperm'] = '��塈堛��塈���� 堹堭 塈��堿塈�� 媢������塈堛. 堹堻堛堭堻�� ��堿��堹 ��堹塈堭堹.';
 $messages['invalidrequest'] = '堹堭堮��塈堻堛 ��塈��媢堛堥堭! ������ 堹塈堹�����塈�� 堸堮��堭�� ��奡堹.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index ce37b745b..9d3cb05e0 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Gr繹nroos <Unknown>                                      |
+ | Author: Jiri Gr繹nroos                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -22,7 +21,7 @@ $labels['server'] = 'Palvelin';
 $labels['login'] = 'Kirjaudu';
 $labels['logout'] = 'Kirjaudu ulos';
 $labels['mail'] = 'S瓣hk繹posti';
-$labels['settings'] = 'Omat asetukset';
+$labels['settings'] = 'Asetukset';
 $labels['addressbook'] = 'Osoitekirja';
 $labels['inbox'] = 'Saapuneet';
 $labels['drafts'] = 'Luonnokset';
@@ -41,6 +40,7 @@ $labels['size'] = 'Koko';
 $labels['priority'] = 'T瓣rkeys';
 $labels['organization'] = 'Organisaatio';
 $labels['readstatus'] = 'Luettu';
+$labels['listoptions'] = 'Listaa valinnat...';
 $labels['mailboxlist'] = 'Kansiot';
 $labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
@@ -396,6 +396,7 @@ $labels['spellcheckignoresyms'] = 'J瓣t瓣 huomiotta sanat, joissa on symboleja';
 $labels['spellcheckignorenums'] = 'J瓣t瓣 huomiotta sanat, joissa on numeroita';
 $labels['spellcheckignorecaps'] = 'J瓣t瓣 huomiotta sanat, joissa kaikki kirjaimet on isoja';
 $labels['addtodict'] = 'Lis瓣瓣 sanakirjaan';
+$labels['mailtoprotohandler'] = 'Rekister繹i mailto:-linkkien protokollak瓣sittelj瓣';
 $labels['folder'] = 'Kansio';
 $labels['foldername'] = 'Kansion nimi';
 $labels['subscribed'] = 'N瓣ytet瓣瓣n';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 004b18ca1..cfaa623b2 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Gr繹nroos <Unknown>                                      |
+ | Author: Jiri Gr繹nroos                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Yhteys IMAP-palvelimeen ep瓣onnistui';
 $messages['servererror'] = 'Palvelinvirhe!';
 $messages['servererrormsg'] = 'Palvelinvirhe: $msg';
 $messages['dberror'] = 'Tietokantavirhe!';
+$messages['requesttimedout'] = 'Pyynt繹 aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
 $messages['invalidrequest'] = 'Virheellinen pyynt繹! Tietoa ei tallennettu.';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index ae46ea702..b6f8e462c 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nicolas DERIVE <kalon33@ubuntu.com>                           |
+ | Author: Nicolas Delvaux                                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -284,6 +283,7 @@ $labels['exportvcards'] = 'Exporter les contacts au format vCard';
 $labels['newcontactgroup'] = 'Cr矇er un nouveau groupe de contacts';
 $labels['grouprename'] = 'Renommer le groupe';
 $labels['groupdelete'] = 'Supprimer le groupe';
+$labels['groupremoveselected'] = 'Retir矇 les contacts s矇lectionn矇s du groupe';
 $labels['previouspage'] = 'Montrer page pr矇c矇dente';
 $labels['firstpage'] = 'Voir la premi癡re page';
 $labels['nextpage'] = 'Montrer page suivante';
@@ -343,6 +343,7 @@ $labels['readwhendeleted'] = 'Marquer le message comme lu �� la suppression';
 $labels['flagfordeletion'] = 'Mettre le drapeau de suppression au lieu de supprimer';
 $labels['skipdeleted'] = 'Ne pas montrer les messages supprim矇s';
 $labels['deletealways'] = 'Lorsque le d矇placement des messages �� la corbeille 矇choue, supprimez-les';
+$labels['deletejunk'] = 'Supprimer directement les pourriels';
 $labels['showremoteimages'] = 'Afficher les images distantes';
 $labels['fromknownsenders'] = 'venant d\'exp矇diteurs connus';
 $labels['always'] = 'toujours';
@@ -388,6 +389,7 @@ $labels['reqdsn'] = 'Toujours demander une notification d\'矇tat de distribution
 $labels['replysamefolder'] = 'Placer les r矇ponses dans le dossier du message auquel il est r矇pondu';
 $labels['defaultaddressbook'] = 'Ajouter de nouveaux contacts au carnet d���adresses s矇lectionn矇';
 $labels['autocompletesingle'] = 'Ne pas tenir compte des adresses emails alternatives dans l\'autoremplissage';
+$labels['listnamedisplay'] = 'Lister les contacts comme';
 $labels['spellcheckbeforesend'] = 'V矇rifier l���orthographe avant l���envoie d���un message';
 $labels['spellcheckoptions'] = 'Options du v矇rificateur d\'orthographe';
 $labels['spellcheckignoresyms'] = 'Ignorer les mots avec des symboles';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 8dd92b5f6..23d6af82a 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emmanuel Andry <Unknown>                                      |
+ | Author: Nicolas Delvaux                                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Erreur de connexion au serveur IMAP';
 $messages['servererror'] = 'Erreur Serveur !';
 $messages['servererrormsg'] = 'Erreur du serveur: $msg';
 $messages['dberror'] = 'Erreur avec la base de donn矇e!';
+$messages['requesttimedout'] = 'D矇lai de la requ礙te expir矇';
 $messages['errorreadonly'] = 'Impossible d\'effectuer cette op矇ration. Le dossier est en lecture seule';
 $messages['errornoperm'] = 'Impossible d\'effectuer cette op矇ration. Permission refus矇e';
 $messages['invalidrequest'] = 'Requ礙te invalide ! Aucune donn矇e n\'a 矇t矇 sauvegard矇e.';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index bb348d447..1d8916ef1 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Yaron <sh.yaron@gmail.com>                                    |
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -30,8 +29,8 @@ $labels['sent'] = '��蚸����';
 $labels['trash'] = '��蚸蚺��';
 $labels['junk'] = '������';
 $labels['subject'] = '����蚸��';
-$labels['from'] = '��蚸������';
-$labels['to'] = '������蛁��';
+$labels['from'] = '����蛌';
+$labels['to'] = '����';
 $labels['cc'] = '��������蛁��';
 $labels['bcc'] = '������蛌�� ����蛂蛌蚳';
 $labels['replyto'] = '��蛌����蛌 ����蛁����';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index be46bea69..35e03cf32 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Moshe Leibovitch <moish@mln.co.il>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = '��蚹蚸蚳 ��蚸蚳蛌 ��������蚳 ����蚸��';
 $messages['servererror'] = '! 蚸������蛌 蚸蚳蛌';
 $messages['servererrormsg'] = '$msg  蚸������蛌 蚸蚳蛌';
 $messages['dberror'] = '! 蚸�������� ����蛂�� ����蛌��������';
+$messages['requesttimedout'] = '蛌�� �������� ������蚹蛈�� ����蚹蚸��';
 $messages['errorreadonly'] = '���� ����蛌�� ����蛈蛁 ��蚺蛁������ ���� ��蛌��蚹 ����蛌�� ��蚹蚳������ ��������';
 $messages['errornoperm'] = '���� ����蛌�� ����蛈蛁 ��蚺蛁������ ���� ������ ��蚳蚸���� ����蛈蛁��';
 $messages['invalidrequest'] = '��蚹蚸�� ���� ����蚹��蛌. ��������蛁 ���� ��蚸��蚳';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 930af8e25..74ef41955 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prsta��i�� <svebor.prstacic@gmail.com>                 |
+ | Author: gogo <trebelnik2@gmail.com>                                   |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -415,7 +414,7 @@ $labels['sortasc'] = 'Sortiraj rastu��im nizom';
 $labels['sortdesc'] = 'Sortiraj opadaju��im nizom';
 $labels['undo'] = 'Poni禳ti';
 $labels['plugin'] = 'Plugin';
-$labels['version'] = 'Verzija';
+$labels['version'] = 'Ina��ica';
 $labels['source'] = 'Izvor';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podr禳ka';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index cca86185d..e3d79d5dd 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela <Unknown>                                                |
+ | Author: bela                                                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -245,7 +244,7 @@ $labels['spouse'] = 'H獺zast獺rs';
 $labels['allfields'] = '��sszes mez��';
 $labels['search'] = 'Keres矇s';
 $labels['advsearch'] = 'R矇szletes keres矇s';
-$labels['advanced'] = 'Halad籀 be獺ll穩t獺sok';
+$labels['advanced'] = 'Halad籀';
 $labels['other'] = 'Egy矇b';
 $labels['typeother'] = 'Egy矇b';
 $labels['typehome'] = 'Otthon';
@@ -264,7 +263,7 @@ $labels['addfield'] = '��j mez�� hozz獺ad獺sa...';
 $labels['addcontact'] = '��j kapcsolat hozz獺ad獺sa';
 $labels['editcontact'] = 'Kapcsolat szerkeszt矇se';
 $labels['contacts'] = 'Kapcsolatok';
-$labels['contactproperties'] = 'Kapcsolatok tulajdons獺gai';
+$labels['contactproperties'] = 'Kapcsolat tulajdons獺gai';
 $labels['personalinfo'] = 'Szem矇lyes adatok';
 $labels['edit'] = 'Szerkeszt矇s';
 $labels['cancel'] = 'M矇gsem';
@@ -345,7 +344,7 @@ $labels['flagfordeletion'] = '��zenet t繹rlend��nek jel繹l矇se t繹rl矇s helyett'
 $labels['skipdeleted'] = 'T繹r繹lt 羹zenetek ne legyenek megjelen穩tve';
 $labels['deletealways'] = '��zenet t繹rl矇se, ha nem siker羹l 獺thelyezni a t繹r繹lt elemek mapp獺ba';
 $labels['deletejunk'] = 'K繹zvetlen t繹rl矇se az 羹zeneteknek a lev矇lszem矇t mapp獺ban';
-$labels['showremoteimages'] = 'T獺voli be獺gyazott k矇pek mutat獺sa';
+$labels['showremoteimages'] = 'T獺voli be獺gyazott k矇pek megjelen穩t矇se';
 $labels['fromknownsenders'] = 'csak ismert felad籀kt籀l';
 $labels['always'] = 'mindig';
 $labels['showinlineimages'] = 'Csatolt k矇pek megjelen穩t矇se az 羹zenet alatt';
@@ -397,10 +396,10 @@ $labels['spellcheckignoresyms'] = 'Speci獺lis karaktereket tartalmaz籀 szavak ki
 $labels['spellcheckignorenums'] = 'Sz獺mot tartalmaz籀 szavak kihagy獺sa';
 $labels['spellcheckignorecaps'] = 'Csak nagybet鑄t tartalmaz籀 szavak kihagy獺sa';
 $labels['addtodict'] = 'Hozz獺ad獺s a sz籀t獺rhoz';
-$labels['mailtoprotohandler'] = 'A roundcube be獺ll穩t獺sa a mailto: linkek kezel��jek矇nt.';
+$labels['mailtoprotohandler'] = 'Be獺ll穩t獺s a mailto: linkek kezel��jek矇nt';
 $labels['folder'] = 'Mappa';
 $labels['foldername'] = 'Mappa neve';
-$labels['subscribed'] = 'Feliratkozott';
+$labels['subscribed'] = 'Feliratkozva';
 $labels['messagecount'] = '��zenet';
 $labels['create'] = 'L矇trehoz獺s';
 $labels['createfolder'] = '��j mappa l矇trehoz獺sa';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 6b26d8f5c..4f101b5e0 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela <Unknown>                                                |
+ | Author: N矇meth Andr獺s <narzym@hotmail.com>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Nem siker羹lt csatlakozni az IMAP szerverhez';
 $messages['servererror'] = 'Szerverhiba!';
 $messages['servererrormsg'] = 'Szerverhiba: $msg';
 $messages['dberror'] = 'Adatb獺zishiba!';
+$messages['requesttimedout'] = 'A k矇r矇s t繳ll矇pte az id��korl獺tot';
 $messages['errorreadonly'] = 'A m鑄veletet nem siker羹lt v矇grehajtani. A mappa 穩r獺sv矇dett.';
 $messages['errornoperm'] = 'A m鑄veletet nem siker羹lt v矇grehajtani. Hozz獺f矇r矇s megtagadva.';
 $messages['invalidrequest'] = '��rv矇nytelen k矇r矇s! Az adatok nem lettek elmentve.';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index d21b48b7b..8d3f2dcdc 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -38,15 +37,21 @@ $labels['to'] = '��梲捸��楖梐';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Reply-To';
+$labels['followupto'] = '堇 桹捸桴掍晙楖��桭';
 $labels['date'] = '埜桭桵捸晥晛桴';
 $labels['size'] = '��捸��';
 $labels['priority'] = '埜梩捸桴掍晙楖��晥桮楖��梮';
 $labels['organization'] = '埥捸捰桭捸朘掍��梣楖��晥桮楖��梮';
+$labels['readstatus'] = '堋梮晥掍����桭捸梮 朘捸��掁捸桴晛梜捸朘';
+$labels['listoptions'] = '��楖����捸朘晛 旍梮梲��捸梮��梮掍�����';
 $labels['mailboxlist'] = '埭捸��捸朘梮掍��';
 $labels['folders'] = '埭捸��捸朘梮掍��';
 $labels['messagesfromto'] = '��捸桭捸朘梮掍�� $from���晛�� $to���旍 掍梐捸晢 $count���晛��';
+$labels['threadsfromto'] = '埳掍桭捸梮掍�� $from-晛�� $to 旍梮掑桹捸梮楖���� $count-晛��';
 $labels['messagenrof'] = '��捸桭捸朘 $nr 掍梐捸晢 $count���晛��';
+$labels['fromtoshort'] = '$from-晛�� $to 旍梮掑桹捸梮楖���� $count-晛��';
 $labels['copy'] = 'Cc';
+$labels['move'] = '��掍梐捸��楖晜掍晙';
 $labels['moveto'] = '��掍梐捸��楖晜掍晙...';
 $labels['download'] = '��捸梫掍晙';
 $labels['filename'] = '��捸桮晙晛 捸梮楖��梮';
@@ -91,11 +96,18 @@ $labels['longoct'] = '��楖朘梲掍桭掅掍��';
 $labels['longnov'] = '��楖桮掍桭掅掍��';
 $labels['longdec'] = '埭掍朘梲掍桭掅掍��';
 $labels['today'] = '埜桮桵����';
+$labels['refresh'] = '埳捸��桭捸��梮掍晙';
 $labels['checkmail'] = '��梲楖��掁掍晙 梮楖�� 梮捸桭捸朘梮掍��旍';
 $labels['compose'] = '堀��掍晙 梮捸桭捸朘';
 $labels['writenewmessage'] = '��楖�� 梮捸桭捸朘';
+$labels['reply'] = '��捸梲捸桵晜捸梮掍晙';
 $labels['replytomessage'] = '��捸梲捸桵晜捸梮掍晙 梮捸桭捸朘晛梮';
 $labels['replytoallmessage'] = '��捸梲捸桵晜捸梮掍晙 掅楖晙楖��晛梮';
+$labels['replyall'] = '��捸梲捸桵晜捸梮掍晙 掅楖晙楖��晛梮';
+$labels['replylist'] = '��捸梲捸桵晜捸梮掍晙 ��楖����捸朘晛梮';
+$labels['forward'] = '埜梩捸梬';
+$labels['forwardinline'] = '��楖晜捸梮��掍晙 梮捸桭捸朘晛 桭掍梬';
+$labels['forwardattachment'] = '��楖晜捸梮��掍晙 朘��桴捸晢';
 $labels['forwardmessage'] = '��楖晜捸梮��掍晙 梮捸桭捸朘旍';
 $labels['deletemessage'] = '��梮梬掍晙 梮捸桭捸朘旍';
 $labels['movemessagetotrash'] = '堀��掍晙 捸梐掅捸��朘梐旍';
@@ -106,19 +118,48 @@ $labels['nextmessage'] = '��楖����捸掑��掍晙 桹捸梬楖��掑 梮捸桭捸朘旍';
 $labels['lastmessage'] = '��楖����捸掑��掍晙 桴掍��梬晛梮 梮捸桭捸朘旍';
 $labels['backtolist'] = '��掍��捸掑捸梩梮捸晙 梮捸桭捸朘梮掍��晛 ��楖����捸朘';
 $labels['viewsource'] = '��楖����捸掑��掍晙 梮捸桭捸朘晛 朘楖掑旍';
+$labels['mark'] = '��梫掍晙';
 $labels['markmessages'] = '��梫掍晙 梮捸桭捸朘梮掍��旍';
 $labels['markread'] = '楖��梣掍桵 朘捸��掑捸��捸晢';
 $labels['markunread'] = '楖��梣掍桵 桯朘捸��掑捸��捸晢';
 $labels['markflagged'] = '楖��梣掍桵 梮梫桴捸晢';
 $labels['markunflagged'] = '楖��梣掍桵 桯梮梫桴捸晢';
+$labels['moreactions'] = '��捸桴掍晙桮捸晙 掁楖��晢楖梐楖��晥桮楖��梮梮掍�����';
+$labels['more'] = '埜桴掍晙晛梮';
+$labels['back'] = '埽梲';
+$labels['options'] = '堋梮梲��捸梮��梮掍��';
 $labels['select'] = '��梫掍晙';
 $labels['all'] = '埴楖晙楖��旍';
 $labels['none'] = '��梮梫掍晙';
 $labels['nonesort'] = '��梮梫掍晙';
+$labels['currpage'] = '埜梩朘捸 敓梬';
 $labels['unread'] = '��朘捸��掑捸��捸晢旍';
 $labels['flagged'] = '��梫桴捸晢';
 $labels['unanswered'] = '埜梮梣捸梲捸桵晜捸梮';
+$labels['deleted'] = '��梮梬桴捸晢';
+$labels['invert'] = '��楖晜捸梲掍梐掍晙';
 $labels['filter'] = '堈梲晛桯';
+$labels['list'] = '��楖����捸朘';
+$labels['threads'] = '埳掍桭捸梮掍��';
+$labels['expand-all'] = '堋梮掑晙捸桮梮掍晙 掅楖晙楖��旍';
+$labels['expand-unread'] = '堋梮掑晙捸桮梮掍晙 桯朘捸��掑捸��桴捸晢旍';
+$labels['collapse-all'] = '��晙桯掍晙 掅楖晙楖��旍';
+$labels['threaded'] = '埳掍桭捸桴楖��桴捸晢';
+$labels['autoexpand_threads'] = '埴捸�� 捸梮掍晙 晥掍桭捸梮掍��旍';
+$labels['do_expand'] = '掅楖晙楖�� 晥掍桭捸梮掍��旍';
+$labels['expand_only_unread'] = '桭晛捸桮梮 桯朘捸��掑捸��桴捸晢 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��楖桴';
+$labels['fromto'] = '����桭晛��/����桭';
+$labels['flag'] = '��梫捸梮';
+$labels['attachment'] = '埥��楖��掑';
+$labels['sentdate'] = '����梐捸��朘桭捸梮 捸桭桵捸晥晛桴';
+$labels['arrival'] = '��梲捸��桭捸梮 埜桭桵捸晥晛桴';
+$labels['asc'] = '旍桵梲 捸梜桭捸梮';
+$labels['desc'] = '旍桵梲 梮桴捸捰桭捸梮';
+$labels['listcolumns'] = '��楖����捸朘晛 桵桮楖��梮桮捸朘梮掍��';
+$labels['listsorting'] = '��掍桵捸朘捸桴楖��桭捸梮 桵桮楖��梮桮捸朘';
+$labels['listorder'] = '��掍桵捸朘捸桴楖��桭捸梮 朘捸��掁旍';
+$labels['listmode'] = '��楖����捸朘楖桴 梲掍桵��晛 梲捸��掅掍��捸朘旍';
+$labels['folderactions'] = '��捸梮捸朘晛 掁楖��晢楖梐楖��晥桮楖��梮梮掍�����';
 $labels['compact'] = '��掍梐桭掍晙';
 $labels['empty'] = '埭捸梲捸��朘掍晙';
 $labels['quota'] = '埭晛桵朘捸桮晛梮 梲捸��捸晢��';
@@ -126,19 +167,31 @@ $labels['unknown'] = '捸梮桹捸桮梲';
 $labels['unlimited'] = '捸梮桵捸桹桭捸梮捸��捸朘';
 $labels['quicksearch'] = '埜��捸掁 楖��楖梮楖��桭';
 $labels['resetsearch'] = '��掍��桵朘桵掍晙 楖��楖梮楖��桭旍';
+$labels['searchmod'] = '����楖梮桭捸梮 ��楖��楖晜晛桯梮掍��';
+$labels['msgtext'] = '��梐梬 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
 $labels['openinextwin'] = '埴捸��掍晙 梮楖�� 梣捸梲楖��桹捸梮楖��桭';
+$labels['emlsave'] = '��掍��掅掍梩梮掍晙 (.eml)';
+$labels['editasnew'] = '埣桭掅捸掁��掍晙 楖��梣掍桵 梮楖��';
 $labels['savemessage'] = '��晛梫掍晙 楖��梣掍桵 桵��捸掁晛��';
 $labels['sendmessage'] = '����梐捸��朘掍晙';
 $labels['addattachment'] = '埥��掍晙 ��捸桮晙';
 $labels['charset'] = '��捸梩捸梫捸��';
 $labels['editortype'] = '埣桭掅捸掁��晛 梲晛梣旍';
 $labels['returnreceipt'] = '��梲捸��桭捸梮 桹捸桴捸桵梲捸掁晛��';
+$labels['dsn'] = '埜梩捸��桭捸梮 朘捸��掁捸桴晛梜捸朘晛 晢捸梮楖����楖��桭';
+$labels['mailreplyintro'] = '$date-晛梮, $sender-旍 掁��掍��.';
+$labels['originalmessage'] = '埜梩捸梬晛梮 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍';
+$labels['editidents'] = '埣桭掅捸掁��掍晙 晛梮��梮楖��晥桮楖��梮梮掍��旍';
+$labels['spellcheck'] = '��捸梩捸桵晜捸晙梮掍��';
 $labels['checkspelling'] = '��梲楖��掁掍晙 楖��梐捸掁��楖��晥桮楖��梮旍';
 $labels['resumeediting'] = '��捸��楖��梮捸朘掍晙 晜桭掅捸掁��楖��桭旍';
 $labels['revertto'] = '��掍��捸朘捸梮掁梮掍晙';
+$labels['attach'] = '埥��掍晙';
 $labels['attachments'] = '埥��楖��桭梮掍��';
 $labels['upload'] = '埴掍梩梮掍晙';
+$labels['uploadprogress'] = '$percent ($current $total-晛��)';
 $labels['close'] = '��捸朘掍晙';
+$labels['messageoptions'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 旍梮梲��捸梮��梮掍�����';
 $labels['low'] = '��捸晢��';
 $labels['lowest'] = '��桴捸捰捸掁楖��桮梮';
 $labels['normal'] = '��楖��桭捸晙';
@@ -147,6 +200,7 @@ $labels['highest'] = '埥捸����楖��捸掁楖��桮梮';
 $labels['nosubject'] = '(捸梩捸梮�� 桴掍��梮捸掁��晛)';
 $labels['showimages'] = '��楖����捸掑��掍晙 梮朘捸��梮掍��旍';
 $labels['alwaysshow'] = '��晛梫梲 ��楖����捸掑��掍晙 梣捸梲朘掍��梮掍��旍 $sender���晛��';
+$labels['isdraft'] = '��捸 桹捸梐楖��掑捸掁��楖��晥桮捸梮 桵��捸掁晛�� 敓';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '��捸��捰 梲掍��桵梲';
 $labels['savesentmessagein'] = '堀��捸梮��掍晙 楖��梐捸��朘桴捸晢 梮捸桭捸朘旍';
@@ -155,6 +209,7 @@ $labels['maxuploadsize'] = '埜梩捸桴掍晙捸掁楖��桮梮 晥楖��桮晙捸梲��掍晙晛 ��捸
 $labels['addcc'] = '埜桴掍晙捸��梮掍晙 Cc';
 $labels['addbcc'] = '埜桴掍晙捸��梮掍晙 Bcc';
 $labels['addreplyto'] = '埜桴掍晙捸��梮掍晙 Reply-To';
+$labels['addfollowupto'] = '埜桴掍晙捸��梮掍晙 桹捸桴掍晙楖��桭';
 $labels['mdnrequest'] = '��捸桭捸朘晛 桹掍梐晛梮捸朘旍 晜梮掑��掍晙 敓 梮捸桭捸朘旍 朘捸��掑捸晙楖��梮 梣掍桵 梲掍梐掍朘捸��梮掍晙 晛��掍梮�� ��捸梮朘捸梮楖��桭 敓�� ��掍梐掍朘捸��梮掍��晙��';
 $labels['receiptread'] = '��捸桭捸朘晛 旍梮晥掍����桭捸梮 晢捸梮楖����捸掁晛��';
 $labels['yourmessage'] = '��捸 ��掍�� 梮捸桭捸朘晛 旍梮晥掍����桭捸梮 晢捸梮楖����捸掁晛��梮 敓';
@@ -162,13 +217,65 @@ $labels['receiptnote'] = '��梫楖��桭�� 埜桮桵 晢捸梮楖����捸掁晛��旍 旍梮掑捸桭�
 $labels['name'] = '��捸朘捸梮楖��梮';
 $labels['firstname'] = '埜梮楖��梮';
 $labels['surname'] = '埜捰掁捸梮楖��梮';
+$labels['middlename'] = '��晛梬晛梮 捸梮楖��梮';
+$labels['nameprefix'] = '��捸晜捸晢捸梮��';
+$labels['namesuffix'] = '��掍��梬捸晢捸梮��';
+$labels['nickname'] = '��捸朘捸梮楖��梮';
+$labels['jobtitle'] = '��捸梫梲楖梮';
+$labels['department'] = '埴捸晡捸梮桭楖��梮��';
+$labels['gender'] = '��掍梩';
+$labels['maidenname'] = '��晛梮桯捸桭楖��桵梮捸朘捸梮 捸捰掁捸梮楖��梮';
 $labels['email'] = '埸朘�����楖桵梲';
+$labels['phone'] = '��掍梩捸晜楖桵';
+$labels['address'] = '��捸桵��掍';
+$labels['street'] = '��楖梐楖��';
+$labels['locality'] = '��捸梐捸��';
+$labels['zipcode'] = '��楖桵梲捸桮晛梮 朘楖掑';
+$labels['region'] = '��捸��捰';
+$labels['country'] = '埽��朘晛��';
+$labels['birthday'] = '埲梮梮掑桮捸梮 ����';
+$labels['anniversary'] = '��捸��掍掑捸��梇';
+$labels['website'] = '埥捸桮��';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = '��梫楖��桭梮掍��';
+$labels['male'] = '捸��捸朘捸梮';
+$labels['female'] = '晛掁捸朘捸梮';
+$labels['manager'] = '��掍梮掍梬掍��';
+$labels['assistant'] = '��掁梮捸朘捸梮';
+$labels['typeassistant'] = '��掁梮捸朘捸梮';
+$labels['spouse'] = '捸桭楖��桵晛梮';
+$labels['allfields'] = '埴楖晙楖�� 掑捸梫梲掍��旍';
+$labels['search'] = '����楖梮楖��桭';
+$labels['advsearch'] = '埣楖��捸��桴捸晢 楖��楖梮楖��桭';
+$labels['advanced'] = '埣楖��捸��桴捸晢';
+$labels['other'] = '埜桮晙';
+$labels['typeother'] = '埜桮晙';
+$labels['typehome'] = '��楖��梮';
+$labels['typework'] = '埜梫晜捸梲捸梮��';
+$labels['typemobile'] = '埴梬梬捸桮晛梮';
+$labels['typemain'] = '堀晙晜捸桴楖��';
+$labels['typehomefax'] = '��捸梮 ��捸��桵';
+$labels['typeworkfax'] = '埜梫梲捸梮捸梮��捸桮晛梮 ��捸��桵';
+$labels['typecar'] = '��掍��掍梮捸';
+$labels['typepager'] = '��掍桮梬掍��';
+$labels['typevideo'] = '��掍桵捸梮桮楖��晥';
+$labels['typehomepage'] = '��朘晛捰掅';
+$labels['typeblog'] = '埴晙楖掁';
+$labels['typeprofile'] = '����楖��捸桮晙';
+$labels['addfield'] = '埜桴掍晙捸��梮掍晙 掑捸梫梲���';
 $labels['addcontact'] = '堀��捸梮��掍晙 梮梫捸晢 桹捸桵��掍梮';
 $labels['editcontact'] = '埣桭掅捸掁��掍晙 桹捸桵��掍梮';
+$labels['contacts'] = '埥捸梣楖��掑梮掍��';
+$labels['contactproperties'] = '埥捸梣楖��掑晛 桹捸梲朘捸梮晛梫梮掍��';
+$labels['personalinfo'] = '埜梮梇梮捸朘捸梮 梲桴桮捸晙梮掍��';
 $labels['edit'] = '埣桭掅捸掁��掍晙';
 $labels['cancel'] = '埳捸��掁掍晙';
 $labels['save'] = '��晛梫掍晙';
 $labels['delete'] = '��梮梬掍晙';
+$labels['rename'] = '��掍��捸梮桴捸梮掍晙';
+$labels['addphoto'] = '埜桴掍晙捸��梮掍晙';
+$labels['replacephoto'] = '��楖晜捸��晛梮掍晙';
+$labels['uploadphoto'] = '��掍��掅掍梩梮掍晙 晙楖��桵捸梮朘捸��';
 $labels['newcontact'] = '��梲掍梐晢掍晙 梮楖�� 桹捸桵��掍��捸��梲';
 $labels['deletecontact'] = '��梮梬掍晙 梮梫捸晢 梮捸桭捸朘梮掍��旍';
 $labels['composeto'] = '堀��掍晙 梮捸桭捸朘';
@@ -176,26 +283,38 @@ $labels['contactsfromto'] = '��捸桵��掍梮掍�� $from���晛�� $to���旍 掍梐捸晢 $co
 $labels['print'] = '��梣掍晙';
 $labels['export'] = '埜��梲捸桹捸梮掍晙';
 $labels['exportvcards'] = '埜��梲捸桹捸梮掍晙 桹捸桵��掍梮掍��旍 vCard 桯捸��捸梇��楖桴';
+$labels['newcontactgroup'] = '��梲掍梐晢掍晙 朘捸梣楖��掑梮掍��晛 梮楖�� 晜楖��桭掅';
+$labels['grouprename'] = '��掍��捸梮桴捸梮掍晙 晜楖��桭掅旍';
+$labels['groupdelete'] = '��梮梬掍晙 晜楖��桭掅旍';
+$labels['groupremoveselected'] = '��掍梩捸��梮掍晙 梮梫桴捸晢 捸梮梇捸梮�� 晜桭掅晛��';
 $labels['previouspage'] = '��楖����捸掑��掍晙 梮捸晜楖��掑 敓梬旍';
 $labels['firstpage'] = '��楖����捸掑��掍晙 捸梩捸梬晛梮 敓梬旍';
 $labels['nextpage'] = '��楖����捸掑��掍晙 桹捸梬楖��掑 敓梬旍';
 $labels['lastpage'] = '��楖����捸掑��掍晙 桴掍��梬晛梮 敓梬旍';
+$labels['group'] = '埣楖��桭掅';
 $labels['groups'] = '埣桭掅掍��';
 $labels['personaladrbook'] = '埜梮梇梮捸朘捸梮 桹捸桵��掍梮掍��';
+$labels['searchsave'] = '��捸桹梣捸梮掍晙 楖��楖梮楖��桭旍';
+$labels['searchdelete'] = '��梮梬掍晙 楖��楖梮楖��桭旍';
 $labels['import'] = '��掍��朘��掍晙';
 $labels['importcontacts'] = '��掍��朘��掍晙 桹捸桵��掍梮掍��';
 $labels['importfromfile'] = '��掍��朘��掍晙 ��捸桮晙晛��';
+$labels['importtarget'] = '埜桴掍晙捸��梮掍晙 梮楖�� 朘捸梣楖��掑梮掍�� 桹捸桵��掍捸掁����楖��桭';
 $labels['importreplace'] = '��楖晜掍晙 楖梐梬 桹捸桵��掍捸掁晛����旍';
 $labels['importtext'] = '埭楖���� 朘捸��楖梐 掍�� 梮掍��朘��掍晙 梮楖�� 桹捸桵��掍梮掍�� 捸梩朘捸 桹捸桵��掍捸掁����晛���� ��捸桭捸朘捸��掁旍 旍梮掑楖��梮楖��桭 敓 桹捸桵��掍梮掍��晛 梮掍��朘��楖��桭旍 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 桯捸��捸梇��楖桴��';
 $labels['done'] = '埜桴捸��梲桴捸晢 敓';
 $labels['settingsfor'] = '��捸晜捸桵晛��楖��晥桮楖��梮梮掍��';
+$labels['about'] = '��朘捸��捸掁晛��';
 $labels['identities'] = '埜梮梇晛��';
 $labels['manageidentities'] = '埥捸��掁捸桴楖��掍晙 捸梮梇捸梮��';
 $labels['newidentity'] = '��楖�� 捸梮梇';
 $labels['newitem'] = '��楖�� 晛��';
 $labels['edititem'] = '埣桭掅捸掁��掍晙 晛��旍';
 $labels['preferhtml'] = '堀掍��捸掑捸桵掍晙 HTML';
+$labels['defaultcharset'] = '埮梩掍晙桮捸晙 梲捸梩捸梫捸��';
 $labels['htmlmessage'] = 'HTML 梮捸桭捸朘';
+$labels['dateformat'] = '埜桭桵捸晥桴晛 梇��捸桯捸��';
+$labels['timeformat'] = '埏捸桭捸梮捸朘晛 梇��捸桯捸��';
 $labels['prettydate'] = '��捸��捰 捸桭桵捸晥桴掍��';
 $labels['setdefault'] = '��晛桭梮捸朘捸梮';
 $labels['autodetect'] = '埜桴梲楖';
@@ -205,6 +324,7 @@ $labels['pagesize'] = '��楖梐掍�� 捸梩 敓梬';
 $labels['signature'] = '��梲楖��捸掁��楖��晥桮楖��梮';
 $labels['dstactive'] = '埜桭捸梩捸桮晛梮 晡捸桭捸梮捸朘';
 $labels['htmleditor'] = '��梲掍梐晢掍晙 HTML 梮捸桭捸朘梮掍��';
+$labels['htmlonreply'] = '桭晛捸桮梮 HTML 桹捸梐楖��掑捸掁��楖��晥桮捸梮旍 梣捸梲捸桵晜捸梮掍晙晛桵';
 $labels['htmlsignature'] = 'HTML 桵梲楖��捸掁��楖��晥桮楖��梮';
 $labels['previewpane'] = '��楖����捸掑��掍晙 梣捸梲楖��桹捸梮旍';
 $labels['skin'] = '��掍桵��晛 梲捸��掅掍��捸朘';
@@ -216,10 +336,14 @@ $labels['mailboxview'] = '��楖桵梲捸��朘梐晛 梲掍桵��';
 $labels['mdnrequests'] = '��掍梐掍朘捸��楖��桭梮掍��';
 $labels['askuser'] = '��捸����梮掍晙 ��掁梲桴楖梐晛梮';
 $labels['autosend'] = '楖��梐捸��朘掍晙 捸桴梲楖桭捸梲';
+$labels['autosendknown'] = '楖��梐捸��朘掍晙 桵梲捸��捸朘捸梮 晛桭 朘捸梣楖��掑梮掍��晛梮, 桭梮捸��捸晢 掑掍梣��掍��楖��桭` 桹捸����梮掍晙 晛梮梇';
+$labels['autosendknownignore'] = '楖��梐捸��朘掍晙 桵梲捸��捸朘捸梮 晛桭 朘捸梣楖��掑梮掍��晛梮, 桭梮捸��捸晢 掑掍梣��掍��楖��桭` 捸梮梲掍桵掍晙';
 $labels['ignore'] = '捸梮梲掍桵掍晙';
 $labels['readwhendeleted'] = '��梮梬掍晙楖���� 梮梫掍晙 梮捸桭捸朘旍 楖��梣掍桵 朘捸��掑捸��捸晢';
 $labels['flagfordeletion'] = '��梮梬掍晙楖�� ��楖晜捸��掍梮 梮梫掍晙 楖��梣掍桵 掍梮晥捸朘捸 梬梮梬桭捸梮';
 $labels['skipdeleted'] = '��楖��桮�� 桯��梲捸晙 梬梮梬桴捸晢 梮捸桭捸朘梮掍��旍';
+$labels['deletealways'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 捸梐掅捸��朘梐 梲掍梐捸��楖晜掍晙晛桵 梇捸晜楖梐桭捸梮 掑掍梣��楖��桭 梬梮梬掍晙 掑��捸梮����';
+$labels['deletejunk'] = '��晛捸梮掁捸桭晛�� 梬梮梬掍晙 埳捸��楖梮 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍';
 $labels['showremoteimages'] = '��楖��桮�� 梲捸晙 桹掍梩捸朘捸 梣捸梲朘掍��梮掍��旍';
 $labels['fromknownsenders'] = '桹捸桮梲梮晛 桹捸桵��掍捸梲掍��掍��晛��';
 $labels['always'] = '桭晛梫梲';
@@ -228,15 +352,51 @@ $labels['autosavedraft'] = '����捸掁��晛 捸桴梲楖桭捸梲 掁��捸梮��楖��桭';
 $labels['everynminutes'] = '捸桭掍梮 $n ��楖梣掍梮';
 $labels['keepalive'] = '��梲楖��掁掍晙 梮楖�� 梮捸桭捸朘梮掍��旍';
 $labels['never'] = '掍��掅掍��';
+$labels['immediately'] = '捸梮桭晛梬捸梣掍桵';
 $labels['messagesdisplaying'] = '梮捸桭捸朘梮掍��旍 ��楖����捸掑��掍晙晛桵';
 $labels['messagescomposition'] = '梮捸桭捸朘 掁��掍晙晛桵';
 $labels['mimeparamfolding'] = '埥��楖��掑梮掍��晛 捸梮楖��梮梮掍��';
 $labels['2231folding'] = '埥捸梲捸��桮捸晙 RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = '埥捸梲捸��桮捸晙 RFC 2047 (捸桮晙)';
+$labels['force7bit'] = '��掁梲捸掁楖��晢掍晙 MIME 掁��捸梮梫楖��桭 8 掅晛晥捸梮楖�� 梮晛梫掍��晛 桹捸桭捸��';
 $labels['advancedoptions'] = '��捸桴掍晙桮捸晙 朘捸��掁捸桴楖��楖��桭梮掍��';
 $labels['focusonnewmessage'] = '埜梩捸梬 掅掍��掍晙 梣捸梲楖��桹捸梮旍 梮楖�� 梮捸桭捸朘 桵梲捸梮捸晙晛桵';
 $labels['checkallfolders'] = '��梲楖��掁掍晙 掅楖晙楖�� 掑捸��捸朘梮掍��旍 梮楖�� 梮捸桭捸朘梮掍��晛 桹捸桭捸��';
+$labels['displaynext'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮旍 梬梮梬掍晙楖���� 朘捸桭 梲掍梐捸��楖晜掍晙楖���� 桹掍梲楖 ��楖����捸掑��掍晙 桹捸梬楖��掑旍';
+$labels['defaultfont'] = 'HTML 桹捸梐楖��掑捸掁��楖��晥桮捸梮 晙梩掍晙桮捸晙 梲捸梩捸梲掍桵捸朘';
+$labels['mainoptions'] = '堀晙晜捸桴楖�� 旍梮梲��捸梮��梮掍��';
+$labels['browseroptions'] = '堈梮梮捸��朘桯晛 旍梮梲��捸梮��梮掍��';
+$labels['section'] = '埴捸晡晛梮';
+$labels['maintenance'] = '��梣捸桵捸��朘楖��桭';
+$labels['newmessage'] = '��楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮';
+$labels['signatureoptions'] = '��梲楖��捸掁��楖��晥桮捸梮 旍梮梲��捸梮��梮掍��';
+$labels['whenreplying'] = '��捸梲捸桵晜捸梮掍晙晛桵';
+$labels['replytopposting'] = '桵朘桵掍晙 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍 桴掍����晛��';
+$labels['replybottomposting'] = '桵朘桵掍晙 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍 梮掍������晛��';
+$labels['replyremovesignature'] = '��捸梲捸桵晜捸梮掍晙晛桵 桹掍梩捸��梮掍晙 桹捸梐楖��掑捸掁��楖��晥桮楖��梮晛�� 梮捸晜楖��掑 桵梲楖��捸掁��楖��晥桮楖��梮旍';
+$labels['autoaddsignature'] = '埜桴掍晙捸��梮掍晙 桵梲楖��捸掁��楖��晥桮楖��梮';
+$labels['newmessageonly'] = '桭晛捸桮梮 梮楖�� 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��楖��桭';
+$labels['replyandforwardonly'] = '梣捸梲捸桵晜捸梮梮掍��楖��桭 �� ��楖晜捸梮��楖��桭梮掍��楖��桭';
+$labels['replysignaturepos'] = '埜桴掍晙捸��梮掍晙 桵梲楖��捸掁��楖��晥桮楖��梮旍 梣捸梲捸桵晜捸梮掍晙晛桵 朘捸桭 ��楖晜捸梮��掍晙晛桵';
+$labels['belowquote'] = '��掍梬掅掍��桭捸梮 梮掍������楖��桭';
+$labels['abovequote'] = '��掍梬掅掍��桭捸梮 桴掍����楖��桭';
+$labels['insertsignature'] = '��掍��掑梮掍晙 桵梲楖��捸掁��楖��晥桮楖��梮旍';
+$labels['previewpanemarkread'] = '��梫掍晙 梮捸晜捸掑晛梲桴捸晢 桹捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 楖��梣掍桵 旍梮晥掍����桴捸晢';
+$labels['afternseconds'] = '$n 桴捸��朘桮捸梮 桹掍梲楖';
+$labels['reqmdn'] = '��晛梫梲 梣捸梲桴晛��掍晙 桵梲捸��捸朘捸梮';
+$labels['reqdsn'] = '��晛梫梲 梣捸梲桴晛��掍晙 捸梩捸��桭捸梮 朘捸��掁捸桴晛梜捸朘晛 晢捸梮楖����楖��桭';
+$labels['replysamefolder'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 梣捸梲捸桵晜捸梮梮掍��旍 梣捸桹掍晙 梮楖��桮梮 梣捸梮捸朘楖��桭';
+$labels['defaultaddressbook'] = '埜桴掍晙捸��梮掍晙 梮楖�� 朘捸梣楖��掑梮掍�� 梮梫桴捸晢 桹捸桵��掍捸掁����晛梮';
+$labels['autocompletesingle'] = '埜桴梲楖晙��捸��桭捸梮 晡捸桭捸梮捸朘 掅捸��捸梩掍晙 捸桮晙旍梮梲��捸梮��捸桮晛梮 敓晙��楖桵梲晛 桹捸桵��掍梮掍��旍';
+$labels['listnamedisplay'] = '��楖����捸掑��掍晙 朘捸梣楖��掑梮掍��旍 楖��梣掍桵';
+$labels['spellcheckbeforesend'] = '��梲楖��掁掍晙 梲捸梩捸桵晜捸晙梮掍��旍 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍 楖��梐捸��朘掍晙楖���� 捸梩捸梬';
+$labels['spellcheckoptions'] = '����掅捸掁��桭捸梮 旍梮梲��捸梮��梮掍��';
+$labels['spellcheckignoresyms'] = '埜梮梲掍桵掍晙 梮梫捸梮梮掍��楖桴 掅捸梩掍��旍';
+$labels['spellcheckignorenums'] = '埜梮梲掍桵掍晙 晥桴掍��楖桴 掅捸梩掍��旍';
+$labels['spellcheckignorecaps'] = '埜梮梲掍桵掍晙 晙��晛桴 桭掍晢捸梲捸梩 掅捸梩掍��旍';
+$labels['addtodict'] = '埜桴掍晙捸��梮掍晙 掅捸梩捸��捸梮楖��桭';
+$labels['mailtoprotohandler'] = 'mailto: 桹梐楖��桭梮掍��晛 桵梣捸桵捸��朘楖梐';
 $labels['folder'] = '埭捸��捸朘';
 $labels['foldername'] = '埭捸��捸朘晛 捸梮楖��梮';
 $labels['subscribed'] = '埴捸晡捸梮楖��掑捸掁��桴捸晢';
@@ -245,11 +405,46 @@ $labels['create'] = '��梲掍梐晢掍晙';
 $labels['createfolder'] = '埴捸��掍晙 梮楖�� 掑捸��捸朘';
 $labels['managefolders'] = '埥捸��掁捸桴楖��掍晙 掑捸��捸朘梮掍��旍';
 $labels['specialfolders'] = '��捸梲楖��朘 掑捸��捸朘梮掍��';
+$labels['properties'] = '��捸梲朘捸梮晛梫梮掍��';
+$labels['folderproperties'] = '��捸梮捸朘晛 桹捸梲朘捸梮晛梫梮掍��';
+$labels['parentfolder'] = '埲梮楖梐 梣捸梮捸朘';
+$labels['location'] = '��捸桮��';
+$labels['info'] = '��掍梐掍朘楖��晥桮楖��梮';
+$labels['getfoldersize'] = '��梣掍晙 梣捸梮捸朘晛 桯捸��旍 晛桭捸梮捸晙楖�� 桹捸桭捸��';
+$labels['changesubscription'] = '��梣掍晙 掅捸晡捸梮楖��掑捸掁��楖��晥桮楖��梮旍 ��楖晜掍晙楖�� 桹捸桭捸��';
+$labels['foldertype'] = '��捸梮捸朘晛 梲掍桵捸朘';
+$labels['personalfolder'] = '埜梮梇梮捸朘捸梮 梣捸梮捸朘';
+$labels['otherfolder'] = '埜桮晙 ��掁梲桴楖梐晛 梣捸梮捸朘';
+$labels['sharedfolder'] = '��捸梮��捸桮晛梮 梣捸梮捸朘';
 $labels['sortby'] = '埭捸桵捸桴楖��掍晙';
 $labels['sortasc'] = '旍桵梲 捸梜桭捸梮';
 $labels['sortdesc'] = '旍桵梲 梮桴捸捰桭捸梮';
+$labels['undo'] = '埽梲捸��朘掍晙';
+$labels['plugin'] = '埣��晛桯';
+$labels['version'] = '��捸��掅掍��捸朘';
+$labels['source'] = '埜梐掅桮楖����';
+$labels['license'] = '埜��梲楖梮捸掁晛��';
+$labels['support'] = '��梲捸梮捸晙 ��掁梮楖��晥桮楖��梮';
 $labels['B'] = '埴';
 $labels['KB'] = '埥埴';
 $labels['MB'] = '��埴';
 $labels['GB'] = '堀埴';
+$labels['unicode'] = '��楖��梮晛朘楖掑';
+$labels['english'] = '埜梮掁晙掍��掍梮';
+$labels['westerneuropean'] = '埜����桭梲捸-埽桴��楖梣捸朘捸梮';
+$labels['easterneuropean'] = '埜����掍晙捸-埽桴��楖梣捸朘捸梮';
+$labels['southeasterneuropean'] = '��捸��捸桴-捸����掍晙捸掍桴��楖梣捸朘捸梮';
+$labels['baltic'] = '埴捸晙晥晛朘';
+$labels['cyrillic'] = '埥晛��晛晙晙晛朘';
+$labels['arabic'] = '埜��捸掅捸朘捸梮';
+$labels['greek'] = '��楖��梮捸朘捸梮';
+$labels['hebrew'] = '����掍捸朘捸梮';
+$labels['turkish'] = '埳楖������捸朘捸梮';
+$labels['nordic'] = '��楖��掑晛朘';
+$labels['thai'] = '埳捸桮晙捸梮掑捸朘捸梮';
+$labels['celtic'] = '埥掍晙梲捸朘捸梮';
+$labels['vietnamese'] = '��晛掍梲梮捸桭捸朘捸梮';
+$labels['japanese'] = '��捸梣楖梮捸朘捸梮';
+$labels['korean'] = '埥楖��掍捸朘捸梮';
+$labels['chinese'] = '��晛梮捸朘捸梮';
 
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 3bd909666..dfb886c15 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -9,20 +9,29 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
 $messages['loading'] = '埴掍梩梮楖��桭...';
+$messages['errortitle'] = '��晜捸��晙';
 $messages['loginfailed'] = '��楖��梲��旍 梇捸晜楖梐桴掍��';
 $messages['cookiesdisabled'] = '苤ookies���梮掍��晛 捸梣捸桹楖桴桴楖��桭旍 掅捸��捸朘捸桮楖��桭 敓';
 $messages['sessionerror'] = '埜梮桴捸桴掍�� 朘捸桭 晡捸桭朘掍梲捸梮�� 桵掍桵晛捸';
 $messages['storageerror'] = 'IMAP 桵掍��桴掍��晛 桹掍梲 朘捸梣旍 梇捸晜楖梐桴掍��';
+$messages['servererror'] = '��掍��桴掍��晛 桵晜捸��晙';
+$messages['servererrormsg'] = '��掍��桴掍��晛 桵晜捸晙` $msg';
+$messages['dberror'] = '��桴桮捸晙梮掍��晛 梫梲掍桭捸��捸梮晛 桵晜捸��晙';
+$messages['requesttimedout'] = '��捸����桭捸梮 晥楖��桮晙捸梲��掍晙晛 晡捸桭捸梮捸朘旍 桵梣捸梩桴掍��';
+$messages['errorreadonly'] = '堀楖��晢楖梐楖��晥桮楖��梮旍 捸梮桹梮捸�� 敓�� ��捸梮捸朘旍 桭晛捸桮梮 旍梮晥掍����桭捸梮 桹捸桭捸�� 敓��';
+$messages['errornoperm'] = '堀楖��晢楖梐楖��晥桮捸梮 朘捸梲捸��桭捸梮 晛��捸桴楖��梮��旍 桭掍��晡桴捸晢 敓��';
+$messages['invalidrequest'] = '��晜捸晙 桹捸����楖��桭, 捸梣捸��掑桮楖��梮��';
 $messages['nomessagesfound'] = '埜桮桵 ��楖桵梲捸��朘梐楖��桭 梮捸桭捸朘梮掍�� 桯朘捸梮';
 $messages['loggedout'] = '埭楖���� 掅捸��掍桹捸梬楖梐 捸桴捸��梲掍��晛�� 捸梫晜捸梲捸梮��旍�� ��梲掍桵楖��晥桮楖��梮���';
 $messages['mailboxempty'] = '��楖桵梲捸��朘梐旍 掑捸梲捸��朘 敓';
+$messages['uploading'] = '��捸桮晙晛 桴掍��掅掍梩梮楖��桭���';
+$messages['uploadingmany'] = '��掍��掅掍梩梮桴楖��桭 掍梮 ��捸桮晙掍��旍���';
 $messages['loadingdata'] = '��桴桮捸晙梮掍��晛 掅掍梩梮捸桴楖��楖��桭���';
 $messages['checkingmail'] = '��楖�� 梮捸桭捸朘梮掍��晛 桵梲楖��掁楖��桭���';
 $messages['sendingmessage'] = '��捸桭捸朘晛 楖��梐捸��朘楖��桭���';
@@ -32,22 +41,31 @@ $messages['messagesaved'] = '��捸桭捸朘旍 掁��捸梮��桴掍�� 楖��梣掍桵 桵��捸掁晛
 $messages['successfullysaved'] = '堀��捸梮��桴捸晢 敓';
 $messages['addedsuccessfully'] = '��捸桵��掍梮 捸桴掍晙捸��桴捸晢 敓';
 $messages['contactexists'] = '埜桮桵 桹捸桵��掍楖桴 捸梮梇旍 捸��掑掍梮 掁��捸梮��桴捸晢 敓';
+$messages['contactnameexists'] = '��楖��桮梮 捸梮楖��梮楖桴 捸��掑掍梮 捸梮梇 掁楖桮楖��晥桮楖��梮 楖��梮晛��';
 $messages['blockedimages'] = '��掍�� 捸梮桴梲捸梮掁楖��晥桮捸梮 桹捸桭捸��, 捸桮桵 梮捸桭捸朘晛 捸��梲捸��晛梮 梮朘捸��梮掍��梮 掅掍梩梮桴捸晢 桯掍梮';
 $messages['encryptedmessage'] = '��掍��楖梐楖��晥桮楖��梮, 捸桮桵 梮捸桭捸朘旍 朘楖掑捸桴楖��桴捸晢 敓';
 $messages['nocontactsfound'] = '��捸桵��掍梮掍�� 桯朘捸梮';
 $messages['contactnotfound'] = '����楖梮桴楖梐 桹捸桵��掍梮 桯掁梲梮桴掍��';
+$messages['contactsearchonly'] = '��掍��桭楖��晢掍�� 梲桴桮捸晙梮掍�� 捸梮梇捸梮�� 楖��楖梮桭捸梮 桹捸桭捸��';
 $messages['sendingfailed'] = '��捸桭捸朘晛 楖��梐捸��朘楖��桭旍 梇捸晜楖梐桴掍��';
 $messages['senttooquickly'] = '埣梮掑��楖��桭 掍梮�� 桵梣捸桵掍晙 $sec 桴捸��朘桮捸梮 桭晛梮桯 捸桮桵 梮捸桭捸朘梮 楖��梐捸��朘掍晙旍';
 $messages['errorsavingsent'] = '����梐捸��朘桴捸晢 梮捸桭捸朘晛 捸��晜晛桴捸��楖��桭旍 晜捸��捸梮桴掍��';
 $messages['errorsaving'] = '堀��捸梮��桭捸梮 桵晜捸晙';
 $messages['errormoving'] = '��捸桭捸朘晛 梲掍梐捸��楖晜桭捸梮 梇捸晜楖梐楖��桭';
+$messages['errorcopying'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 梣捸梲梜掍梮楖��桭旍 梇捸晜楖梐桴掍����';
 $messages['errordeleting'] = '��捸桭捸朘晛 梬梮梬桭捸梮 梇捸晜楖梐楖��桭';
+$messages['errormarking'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 梮梫楖��桭旍 梇捸晜楖梐桴掍����';
 $messages['deletecontactconfirm'] = '����捰楖����桭 敓�� 梬梮梬掍晙 梮梫桴捸晢 捸梮梇掍��晛梮';
+$messages['deletegroupconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 楖��捰楖��桭 掍�� 梬梮梬掍晙 梮梫桴捸晢 晜楖��桭掅旍��';
 $messages['deletemessagesconfirm'] = '����捰楖����桭 敓�� 梬梮梬掍晙 梮梫桴捸晢 梮捸桭捸朘梮掍��旍';
 $messages['deletefolderconfirm'] = '����捰楖����桭 敓�� 梬梮梬掍晙 捸桮桵 掑捸��捸朘旍';
 $messages['purgefolderconfirm'] = '����捰楖����桭 敓�� 梬梮梬掍晙 捸桮桵 掑捸��捸朘晛 掅楖晙楖�� 梮捸桭捸朘梮掍��旍';
+$messages['contactdeleting'] = '埜梮梇晛 梬梮梬楖��桭���';
+$messages['groupdeleting'] = '埣桭掅晛 梬梮梬楖��桭���';
 $messages['folderdeleting'] = '埭捸��捸朘旍 梬梮梬桴楖��桭 敓���';
 $messages['foldermoving'] = '埭捸��捸朘旍 梲掍梐捸��楖晜桴楖��桭 敓���';
+$messages['foldersubscribing'] = '��捸梮捸朘晛 掅捸晡捸梮楖��掑捸掁��楖��桭���';
+$messages['folderunsubscribing'] = '��捸梮捸朘晛 捸梣捸掅捸晡捸梮楖��掑捸掁��楖��桭���';
 $messages['formincomplete'] = '����旍 晥掍��晛 敓 晙��捸��桴捸晢';
 $messages['noemailwarning'] = '��楖��梲��捸掁��掍�� 梜晛梫梲 敓晙. 桹捸桵��掍';
 $messages['nonamewarning'] = '��楖��梲��捸掁��掍�� 捸梮楖��梮';
@@ -59,12 +77,18 @@ $messages['nobodywarning'] = '����梐捸��朘掍��晙 捸桮桵 梮捸桭捸朘旍 掑捸梲捸���
 $messages['notsentwarning'] = '��捸桭捸朘梮 楖��梐捸��朘桴捸晢 桯敓�� ��梮梬掍��晙 ��掍�� 梮捸桭捸朘旍';
 $messages['noldapserver'] = '堋梮梲��掍�� ldap 桵掍��桴掍�� 楖��楖梮桭捸梮 桹捸桭捸��';
 $messages['nosearchname'] = '��楖��梲��捸掁��掍�� 桹捸桵��掍捸梲掍�� 朘捸桭 敓晙. 桹捸桵��掍';
+$messages['notuploadedwarning'] = '��桯 掅楖晙楖�� 朘��桴捸晢 梮桮楖��晥掍��梮 掍梮 桴掍��掅掍梩梮桴掍晙�� ��梣捸桵掍�� 朘捸桭 旍梮掑桹捸梲掍�� 桴掍��掅掍梩梮楖��桭旍��';
 $messages['searchsuccessful'] = '堀梲梮桴掍�� $nr 梮捸桭捸朘';
+$messages['contactsearchsuccessful'] = '堀梲梮桴掍晙 敓 $nr 捸梮梇��';
 $messages['searchnomatch'] = '��捸桭捸梣捸梲捸桵晜捸梮 梮捸桭捸朘梮掍�� 桯掁梲梮桴掍��晛梮';
 $messages['searching'] = '����楖梮楖��桭...';
 $messages['checking'] = '��梲楖��掁楖��桭���';
 $messages['nospellerrors'] = '����梐捸掁��捸朘捸梮 桵晜捸晙梮掍�� 桯朘捸梮';
 $messages['folderdeleted'] = '埭捸��捸朘旍 梬梮梬桴掍��';
+$messages['foldersubscribed'] = '��捸梮捸朘晛梮 掅捸晡捸梮楖��掑捸掁��楖��桭旍 桹捸梬楖梐桴掍����';
+$messages['folderunsubscribed'] = '��捸梮捸朘晛�� 捸梣捸掅捸晡捸梮楖��掑捸掁��楖��桭旍 桹捸梬楖梐桴掍����';
+$messages['folderpurged'] = '��捸梮捸朘旍 掅捸��掍桹捸梬楖梐 掑捸梲捸��朘桴掍����';
+$messages['folderexpunged'] = '��捸梮捸朘旍 掅捸��掍桹捸梬楖梐 桵掍梐桭桴掍����';
 $messages['deletedsuccessfully'] = '��梮梬桴捸晢 敓';
 $messages['converting'] = '��捸桭捸朘晛 梇��捸桴楖��桭捸梮 桹掍梩捸��楖��桭���';
 $messages['messageopenerror'] = '��捸桭捸朘晛 掅掍梩梮桴楖��桭旍 桵掍��桴掍��晛�� 梇捸晜楖梐桴掍��';
@@ -75,16 +99,62 @@ $messages['copyerror'] = '��捸桵��掍梮掍��晛 朘��朘梮����晛梮捸朘楖��桭旍 梇捸晜
 $messages['sourceisreadonly'] = '埜桮桵 桹捸桵��掍梮 梣捸梫梲梣捸梮桴捸晢 敓';
 $messages['errorsavingcontact'] = '��捸桵��掍晛 掁��捸梮��楖��桭梮 梇捸晜楖梐桴掍��';
 $messages['movingmessage'] = '��捸桭捸朘旍 梲掍梐捸��楖晜桴楖��桭 敓���';
+$messages['copyingmessage'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 梣捸梲梜掍梮楖��桭���';
+$messages['copyingcontact'] = '埜梮梇捸梮�� 梣捸梲梜掍梮楖��桭���';
+$messages['deletingmessage'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 梬梮梬楖��桭���';
+$messages['markingmessage'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��晛 梮梫楖��桭���';
+$messages['addingmember'] = '埜梮梇捸梮�� 捸桴掍晙捸��楖��桭 晜桭掅晛梮���';
+$messages['removingmember'] = '埜梮梇捸梮�� 桹掍梩捸��楖��桭 晜桭掅晛�����';
 $messages['receiptsent'] = '��捸桭捸朘晛 旍梮晥掍����桭捸梮 晢捸梮楖����捸掁晛��梮 楖��梐捸��朘桴捸晢 敓';
 $messages['errorsendingreceipt'] = '埲捸梮楖����捸掁��晛 楖��梐捸��朘楖��桭旍 梇捸晜楖梐桴掍��';
+$messages['deleteidentityconfirm'] = '埭楖���� 晛桵朘捸梣掍��桵 楖��捰楖��桭 掍�� 梬梮梬掍晙 捸桮桵 晛梮��梮楖��晥桮楖��梮旍��';
 $messages['nodeletelastidentity'] = '埜梮桹梮捸�� 敓 梬梮梬掍晙 桴掍��梬晛梮 梲捸��掅掍��捸朘旍';
 $messages['forbiddencharacter'] = '埭捸��捸朘晛 捸梮楖��梮旍 梣捸��楖��梮捸朘楖��桭 敓 捸梮晥楖��桮晙捸梲��掍晙晛 梮梫捸梮';
 $messages['selectimportfile'] = '堋梮梲��掍�� 楖��梐捸��朘桴楖梐 ��捸桮晙旍';
 $messages['addresswriterror'] = '堋梮梲��桴捸晢 桹捸桵��掍捸掁晛����旍 掍梮晥捸朘捸 桯敓 ��楖��楖晜桭捸梮';
+$messages['contactaddedtogroup'] = '埜梮梇晛梮�� 掅捸��掍桹捸梬楖梐 捸桴掍晙捸��桴掍��晛梮 晜桭掅晛梮��';
+$messages['contactremovedfromgroup'] = '埜梮梇晛梮�� 掅捸��掍桹捸梬楖梐 桹捸梮桴掍��晛梮 晜桭掅晛����';
 $messages['importwait'] = '��掍��朘��楖��桭梮 旍梮晥捸����晛 桭掍梬 敓...';
 $messages['importerror'] = '��掍��朘��楖��桭旍 晜捸��捸梮桴掍���� ��掍��朘��桴捸晢 ��捸桮晙旍 vCard 桯捸��捸梇��晛 桯敓��';
 $messages['importconfirm'] = '$inserted 梮楖�� 梮掍��朘��桴捸晢 桹捸桵��掍梮掍��, $skipped 捸��掑掍梮 捸梩朘捸 桹捸桵��掍梮掍���� <p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>埴捸�� 晥楖梐梮桴掍�� $skipped 捸梩朘捸 掁��捸梩楖��桭</b>';
 $messages['opnotpermitted'] = '堀楖��晢楖梐楖��晥桮楖��梮旍 捸梮晥楖��桮晙捸梲��掍晙晛 敓��';
 $messages['nofromaddress'] = '��梫桴捸晢 捸梮梇旍 桹捸桵��掍 桯楖��梮晛��';
 $messages['editorwarning'] = '埭掍梣晛 梣捸��捰 梲掍��桵梲晛 晜桭掅捸掁��晛桯 捸梮��桭捸梮 掑掍梣��楖��桭 朘朘楖��晛 梲掍��桵梲晛 梇��捸桴楖��楖��桭旍�� ��捸��楖��梮捸朘掍��晙��';
+$messages['httpreceivedencrypterror'] = '��捸桭捸朘捸��掁晛 晙捸����晛 桵晜捸晙�� 埭晛桭掍�� 桹捸桭捸朘捸��掁旍 桵梣捸桵捸��朘楖梐 捸梮梇梮捸朘捸捰桭晛梮�� <b>��掍�� 梮捸桭捸朘旍 楖��梐捸��朘桴捸晢 桯敓��</b>';
+$messages['smtpconnerror'] = 'SMTP 桵晜捸晙 ($code)` ��掍��桴掍��晛 桹掍梲 朘捸梣旍 梇捸晜楖梐桴掍����';
+$messages['smtpautherror'] = 'SMTP 桵晜捸晙 ($code)` ��楖��桮梮捸朘捸梮捸��楖��桭旍 梇捸晜楖梐桴掍����';
+$messages['smtpfromerror'] = 'SMTP 桵晜捸晙 ($code)` ����梣掍桵 "$from" ($msg) 桹捸梐楖��掑捸掁��楖��晥桮楖��梮旍 楖��梐捸��朘掍晙旍 梇捸晜楖梐桴掍����';
+$messages['smtptoerror'] = 'SMTP 桵晜捸晙 ($code)` ��捸梐楖��掑捸掁��楖��晥桮捸梮 桵梲捸��楖梐 "$to"-晛梮 ($msg) 捸桴掍晙捸��梮掍晙旍 梇捸晜楖梐桴掍����';
+$messages['smtprecipientserror'] = 'SMTP 桵晜捸晙` 桵梲捸��楖梐梮掍��晛 ��楖����捸朘晛 旍梮晥掍����桭捸梮 梇捸晜楖梐楖��桭��';
+$messages['smtperror'] = 'SMTP 桵晜捸晙` $msg';
+$messages['emailformaterror'] = '��晜捸晙 敓晙��楖桵梲晛 桹捸桵��掍` $email';
+$messages['toomanyrecipients'] = '��梲捸��楖梐梮掍��晛 ��捸梮捸朘旍 桯捸��捸捰捸梮�� 桭掍晢 敓�� ��桴捸捰掍����掍�� 桭晛梮桯�� $max-旍��';
+$messages['maxgroupmembersreached'] = '埣桭掅晛 捸梮掑捸桭梮掍��晛 ��捸梮捸��旍 掁掍��捸捰捸梮��楖��桭 敓 晥楖��桮晙捸梲��掍晙晛 $max-旍��';
+$messages['internalerror'] = '��掍����晛梮 桵晜捸晙, 朘��朘晛梮 ��楖��梇掍����';
+$messages['contactdelerror'] = '埜梮梇捸梮�� 梬梮梬楖��桭旍 梇捸晜楖梐桴掍����';
+$messages['contactdeleted'] = '埜梮梇捸梮�� 梬梮梬楖��桭旍 桹捸梬楖梐桴掍����';
+$messages['contactrestoreerror'] = '��梮梬桴捸晢 捸梮梇捸梮�� 桴掍��捸朘捸梮掁梮楖��桭旍 梇捸晜楖梐桴掍����';
+$messages['contactrestored'] = '��梮梬桴捸晢 捸梮梇捸梮�� 桴掍��捸朘捸梮掁梮楖��桭旍 桹捸梬楖梐桴掍����';
+$messages['groupdeleted'] = '埣楖��桭掅旍 梬梮梬桴掍����';
+$messages['grouprenamed'] = '埣楖��桭掅旍 桴掍��捸梮桴捸梮桴掍����';
+$messages['groupcreated'] = '埣楖��桭掅旍 桵梲掍梐晢桴掍����';
+$messages['savedsearchdeleted'] = '��捸桹梣捸梮桴捸晢 楖��楖梮楖��桭旍 梬梮梬桴掍����';
+$messages['savedsearchdeleteerror'] = '��捸桹梣捸梮桴捸晢 楖��楖梮桭捸梮 梬梮梬楖��桭旍 梇捸晜楖梐桴掍����';
+$messages['savedsearchcreated'] = '����楖梮楖��桭旍 梣捸桹梣捸梮桴掍����';
+$messages['savedsearchcreateerror'] = '��捸桹梣捸梮桴捸晢 楖��楖梮桭捸梮 桵梲掍梐晢楖��桭旍 梇捸晜楖梐桴掍����';
+$messages['messagedeleted'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 梬梮梬桴掍��晛梮��';
+$messages['messagemoved'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 梲掍梐捸��楖晜桴掍��晛梮��';
+$messages['messagecopied'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 梣捸梲梜掍梮桴掍��晛梮��';
+$messages['messagemarked'] = '��捸梐楖��掑捸掁��楖��晥桮楖��梮梮掍��旍 梮梫桴掍��晛梮��';
+$messages['autocompletechars'] = '埜桴梲楖晙��捸��桭捸梮 桹捸桭捸�� 梮掍��桭楖��晢掍�� 捸梩梮桴捸捰梮 $min 梮晛梫��';
+$messages['autocompletemore'] = '堀梲梮桴捸晢 掍梮 桹捸桭捸梣捸梲捸桵晜捸梮楖梐 掁��捸梩楖��桭梮掍��, 梮掍��桭楖��晢掍�� 桹捸桴掍晙桮捸晙 梮晛梫掍����';
+$messages['namecannotbeempty'] = '埜梮楖��梮旍 掑捸梲捸��朘 桯晛 朘捸��楖梐 晙晛梮掍晙��';
+$messages['nametoolong'] = '埜梮楖��梮旍 桯捸��捸捰捸梮�� 掍��朘捸�� 敓��';
+$messages['folderupdated'] = '��捸梮捸朘旍 晥捸��桭捸��桴掍����';
+$messages['foldercreated'] = '��捸梮捸朘旍 桵梲掍梐晢桴掍����';
+$messages['invalidimageformat'] = '��捸梲朘掍��晛 桵晜捸晙 梇��捸桯捸����';
+$messages['mispellingsfound'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 桭掍梬 朘捸梮 梲捸梩捸桵晜捸晙梮掍����';
+$messages['parentnotwritable'] = '��梫桴捸晢 梣捸梮捸朘晛 桭掍梬 梣捸梮捸朘晛 桵梲掍梐晢楖��桭旍 朘捸桭 梲掍梐捸��楖晜楖��桭旍 捸梮桹梮捸�� 敓 捸梮掅捸桴捸��捸�� 晛��捸桴楖��梮��梮掍��晛 梣捸梲梜捸梩楖桴��';
+$messages['messagetoobig'] = '��捸梐楖��掑捸掁��楖��晥桮捸梮 桭捸桵旍 桯捸��捸捰捸梮�� 桭掍晢 敓 桵梣捸桵捸��朘桭捸梮 桹捸桭捸����';
 
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 76d44a810..924003d8b 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla <Unknown>                                    |
+ | Author: Thomas                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index ce2398d20..66a585e7f 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
+ | Author: Takahiro Kambe                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -96,7 +95,7 @@ $labels['longdec'] = '12���';
 $labels['today'] = '隞����';
 $labels['refresh'] = '���隤剛噯���';
 $labels['checkmail'] = '��啜�����撅���������∼����颯�潦�詻��蝣箄��';
-$labels['compose'] = '��∼����颯�潦�詻��雿����';
+$labels['compose'] = '��∼����颯�潦�詻�桐�����';
 $labels['writenewmessage'] = '��啜�������∼����颯�潦�詻��雿����';
 $labels['reply'] = '餈�靽�';
 $labels['replytomessage'] = '���靽∟����怨��靽�';
@@ -166,7 +165,7 @@ $labels['unlimited'] = '��∪�園��';
 $labels['quicksearch'] = '擃����璊�蝝�';
 $labels['resetsearch'] = '璊�蝝Ｕ��閫����';
 $labels['searchmod'] = '璊�蝝Ｕ�格�∩辣';
-$labels['msgtext'] = '��∼����颯�潦�詻�桀�其��';
+$labels['msgtext'] = '��∼����颯�潦�詨�其��';
 $labels['openinextwin'] = '��啜�������艾����喋����艾�折�����';
 $labels['emlsave'] = '�����艾�喋�准�潦��(.eml敶Ｗ��)';
 $labels['editasnew'] = '��啜�������∼����颯�潦�詻�具����衣楊���';
@@ -302,7 +301,7 @@ $labels['importreplace'] = '��Ｕ����研�孵董��其����函蔭���������';
 $labels['importtext'] = '��Ｗ����柴�Ｕ����研�孵董���������蝯∪�������Ｕ�������准�潦����扼����整�������曉�具��<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 敶Ｗ����������柴�扎�喋����潦����怠紋敹������艾����整�����';
 $labels['done'] = '摰�鈭�';
 $labels['settingsfor'] = '甈∼�株身摰�:';
-$labels['about'] = 'Roundcube Webmail��怒�扎�����';
+$labels['about'] = '�����柴����准�啜�押����怒�扎�����';
 $labels['preferences'] = '閮剖��';
 $labels['userpreferences'] = '��艾�潦�嗚�潸身摰�';
 $labels['editpreferences'] = '��艾�潦�嗚�潸身摰����憭����';
@@ -354,8 +353,8 @@ $labels['everynminutes'] = '$n���瘥�';
 $labels['keepalive'] = '��啁����∼����颯�潦�詻��蝣箄��������������';
 $labels['never'] = '�����芥��';
 $labels['immediately'] = '��單��';
-$labels['messagesdisplaying'] = '��∼����颯�潦�詻��銵函內';
-$labels['messagescomposition'] = '��∼����颯�潦�詻��雿����';
+$labels['messagesdisplaying'] = '��∼����颯�潦�詻�株”蝷�';
+$labels['messagescomposition'] = '��∼����颯�潦�詻�桐�����';
 $labels['mimeparamfolding'] = '瘛颱�������∼�扎�怒�桀�����';
 $labels['2231folding'] = 'RFC 2231��怠����冽�����(Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231(MS Outlook)';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index f6dc49b4d..81e6d4765 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
+ | Author: Takahiro Kambe                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'IMAP ��萸�潦����潦�詻�格�亦����怠仃��������整������
 $messages['servererror'] = '��萸�潦����潦�扼�具�押�潦�扼��!';
 $messages['servererrormsg'] = '��萸�潦����潦�具�押��: $msg';
 $messages['dberror'] = '�����潦�踴����潦�嫘�柴�具�押�潦�扼��!';
+$messages['requesttimedout'] = '��芥�胯�具�嫘����柴�踴�扎����Ｕ�艾��';
 $messages['errorreadonly'] = '���雿����摰�銵���扼����整�������扼�������������押�怒����潦�航狎��輯噯��踹����具�扼�����';
 $messages['errornoperm'] = '���雿����摰�銵���扼����整�������扼��������璅拚�������������整��������';
 $messages['invalidrequest'] = '銝�甇���芥�芥�胯�具�嫘����扼��!  �����潦�踴�臭��摮������艾����整��������';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 6a40dcf38..db0c7e5e3 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: seunghwan lee <hellix98@gmail.com>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -42,8 +41,10 @@ $labels['organization'] = '篣國��';
 $labels['mailboxlist'] = '��渠��';
 $labels['folders'] = '��渠��';
 $labels['messagesfromto'] = '$count 穈� 鴗� $from ������ $to 貒� 諰����鴔�';
+$labels['threadsfromto'] = '$from ������ $to 篧�鴔� $count 穈���� ��圉�����';
 $labels['messagenrof'] = '$count 穈� 鴗� $nr 貒� 諰����鴔�';
 $labels['copy'] = '麆賄※';
+$labels['move'] = '��渠��';
 $labels['moveto'] = '��渠��...';
 $labels['download'] = '��木�渠�����';
 $labels['filename'] = '������ ��渠��';
@@ -88,11 +89,18 @@ $labels['longoct'] = '10���';
 $labels['longnov'] = '11���';
 $labels['longdec'] = '12���';
 $labels['today'] = '��月��';
+$labels['refresh'] = '���諢� 窸�儦�';
 $labels['checkmail'] = '��� 諰���� ������';
 $labels['compose'] = '諰���� ��國萼';
 $labels['writenewmessage'] = '��� 諰���� ������';
+$labels['reply'] = '������';
 $labels['replytomessage'] = '������ ������';
 $labels['replytoallmessage'] = '貐渠�賄�渥�� 諈刺�� ������������窶� ������';
+$labels['replyall'] = '���麮� ������';
+$labels['replylist'] = '������ 諈拘��';
+$labels['forward'] = '������';
+$labels['forwardinline'] = '������';
+$labels['forwardattachment'] = '諰���潰�� 麮刺�������潺�� ������';
 $labels['forwardmessage'] = '諰���� ������';
 $labels['deletemessage'] = '諰���� ��原��';
 $labels['movemessagetotrash'] = '諰���� ��渥����蛙�潺�� ��渠��';
@@ -103,19 +111,42 @@ $labels['nextmessage'] = '��木�� 諰���� 貐湊萼';
 $labels['lastmessage'] = '諤�鴔�諤� 諰���� 貐湊萼';
 $labels['backtolist'] = '諰���� 諈拘����潺��';
 $labels['viewsource'] = '������ 貐湊萼';
+$labels['mark'] = '������';
 $labels['markmessages'] = '諰����鴔� ������';
 $labels['markread'] = '��趣�� 窶���潺�� ������';
 $labels['markunread'] = '��趣�� ������ 窶���潺�� ������';
 $labels['markflagged'] = '篧�諻� ��禹萼';
 $labels['markunflagged'] = '篧�諻� ��渠收篣�';
+$labels['moreactions'] = '��渥�賄�� ������...';
+$labels['more'] = '���貐湊萼';
+$labels['back'] = '��月��';
+$labels['options'] = '������ ��秒��';
 $labels['select'] = '������';
 $labels['all'] = '諈刺��';
 $labels['none'] = '������';
 $labels['nonesort'] = '������';
+$labels['currpage'] = '������ �����渥��';
 $labels['unread'] = '��趣�� ������';
 $labels['flagged'] = '篧�諻�';
 $labels['unanswered'] = '��蛙�伕��鴔� ������';
+$labels['deleted'] = '��原�����';
+$labels['invert'] = '諻����';
 $labels['filter'] = '������';
+$labels['list'] = '謔科�欠��';
+$labels['threads'] = '��圉�����';
+$labels['expand-all'] = '諈刺�� ������';
+$labels['collapse-all'] = '諈刺�� ���篣�';
+$labels['threaded'] = '篞賈ㄨ������';
+$labels['autoexpand_threads'] = '諈刺�� 諰����鴔� ������';
+$labels['flag'] = '������';
+$labels['attachment'] = '麮刺��';
+$labels['sentdate'] = '貐渠�� ���鴔�';
+$labels['arrival'] = '������ ���鴔�';
+$labels['asc'] = '��月��麆到��';
+$labels['desc'] = '��渠汝麆到��';
+$labels['listsorting'] = '������';
+$labels['listorder'] = '������ ������';
+$labels['folderactions'] = '��渠�� 諈����';
 $labels['compact'] = '穈���刮��窶�';
 $labels['empty'] = '赬���國萼';
 $labels['quota'] = '�����欠�� ��科��';
@@ -123,19 +154,28 @@ $labels['unknown'] = '������ ������';
 $labels['unlimited'] = '������ ������';
 $labels['quicksearch'] = '赬刺收 麆樽萼';
 $labels['resetsearch'] = '麆樽萼 謔科��';
+$labels['msgtext'] = '���麮� 諰����鴔�';
 $labels['openinextwin'] = '��� 麆趣����� ��湊萼';
+$labels['emlsave'] = '��木�渠����� (.eml)';
 $labels['savemessage'] = '������������ ������';
 $labels['sendmessage'] = '諰���� 鴔�篣� 貐渠��';
 $labels['addattachment'] = '������ 麮刺��';
 $labels['charset'] = '諡賄�����';
 $labels['editortype'] = '��賄��篣� ������';
-$labels['returnreceipt'] = '������ ������';
+$labels['returnreceipt'] = '������ ������ ���麮厝��篣�';
+$labels['dsn'] = '�����∫����� 諰���� 諻�篣�';
+$labels['mailreplyintro'] = '$data���, $sender穈� ������:';
+$labels['originalmessage'] = '���貐� 諰���賄��';
+$labels['spellcheck'] = '諤�黺月��';
 $labels['checkspelling'] = '��欠��諤� 麮渣��';
 $labels['resumeediting'] = '��賄�� 窸����';
 $labels['revertto'] = '������穈�';
+$labels['attach'] = '麮刺��';
 $labels['attachments'] = '麮刺�� ������';
 $labels['upload'] = '���諢����';
+$labels['uploadprogress'] = '$percent ($total ������ $current)';
 $labels['close'] = '��恰萼';
+$labels['messageoptions'] = '諰����鴔� ��蛙��(���)...';
 $labels['low'] = '��桁��';
 $labels['lowest'] = '穈���� ��桁��';
 $labels['normal'] = '貐渣��';
@@ -144,6 +184,7 @@ $labels['highest'] = '穈���� ������';
 $labels['nosubject'] = '(���諈� ������)';
 $labels['showimages'] = '��渠站鴔� ������';
 $labels['alwaysshow'] = '$sender ������ ��� ��渠站鴔� ��原�� 貐湊萼';
+$labels['isdraft'] = '��� 諰����鴔���� ������ 貐湊�� 諰����鴔� ���������.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '��潺�� �����欠��';
 $labels['savesentmessagein'] = '貐渠�� 諰����鴔�諝� ��木����� ������';
@@ -159,13 +200,64 @@ $labels['receiptnote'] = '鴥潰��: ��� �����賄�� ��� 諰����鴔�穈� ������������ 儢
 $labels['name'] = '������ ��渠��';
 $labels['firstname'] = '��渠��';
 $labels['surname'] = '���';
+$labels['middlename'] = '穈���渠�� ��渠��';
+$labels['nameprefix'] = '���������';
+$labels['namesuffix'] = '���諯賄��';
+$labels['nickname'] = '貐�諈�';
+$labels['jobtitle'] = '鴔����';
+$labels['department'] = '賱����';
+$labels['gender'] = '��梵��';
+$labels['maidenname'] = '窶堅�� ��� ��渠��';
 $labels['email'] = '��渠�����';
+$labels['phone'] = '������';
+$labels['address'] = '鴥潰��';
+$labels['street'] = '��賈��鴥潰��';
+$labels['locality'] = '���/窱�/窱�';
+$labels['zipcode'] = '��堅�賈�����';
+$labels['region'] = '���';
+$labels['country'] = '窱匪��';
+$labels['birthday'] = '������������';
+$labels['anniversary'] = '篣圉�����';
+$labels['website'] = '��寢�科�渣��';
+$labels['instantmessenger'] = '諰�������';
+$labels['notes'] = '��貲��';
+$labels['male'] = '��到��';
+$labels['female'] = '��科��';
+$labels['manager'] = '窵�謔科��';
+$labels['assistant'] = '�����圉站';
+$labels['typeassistant'] = '�����圉站';
+$labels['spouse'] = '諻域�域��';
+$labels['allfields'] = '儦�窱� ���麮�';
+$labels['search'] = '窶����';
+$labels['advsearch'] = '������ 窶����';
+$labels['advanced'] = '窸�篣� ��木��';
+$labels['other'] = '篞� ���';
+$labels['typeother'] = '篞� ���';
+$labels['typehome'] = '���';
+$labels['typework'] = '鴔����';
+$labels['typemobile'] = '��渠�����';
+$labels['typemain'] = '鴥�';
+$labels['typehomefax'] = '��拖��(鴔�)';
+$labels['typeworkfax'] = '��拖��(鴔����)';
+$labels['typecar'] = '������麆�';
+$labels['typepager'] = '��賄��篣�';
+$labels['typevideo'] = '���������';
+$labels['typehomepage'] = '��� �����渥��';
+$labels['typeblog'] = '賳�諢�篞�';
+$labels['typeprofile'] = '���篣域��穈�';
+$labels['addfield'] = '��卿版 黺�穈�..';
 $labels['addcontact'] = '��� ��圉�趣�� 黺�穈�';
 $labels['editcontact'] = '��圉�趣�� ��賄��';
+$labels['contacts'] = '��圉�趣��';
+$labels['personalinfo'] = '穈���� ���貐�';
 $labels['edit'] = '��賄��';
 $labels['cancel'] = '鼒到��';
 $labels['save'] = '������';
 $labels['delete'] = '��原��';
+$labels['rename'] = '��渠�� 貐�窶�';
+$labels['addphoto'] = '黺�穈�';
+$labels['replacephoto'] = '諻�篨資萼';
+$labels['uploadphoto'] = '��科�� ��禺收篣�';
 $labels['newcontact'] = '��� ��圉�趣�� 儦渠�� 諤���曰萼';
 $labels['deletecontact'] = '��������� ��圉�趣�� ��原��';
 $labels['composeto'] = '��� 諰���� ������';
@@ -173,10 +265,15 @@ $labels['contactsfromto'] = '$from ������ $to 諢���� ��圉�趣�� $count 穈�';
 $labels['print'] = '��賄��';
 $labels['export'] = '��渠陷��湊萼';
 $labels['exportvcards'] = '��圉�趣��諝� vCard ��禺孚��潺�� ��渠陷��湊萼';
+$labels['newcontactgroup'] = '���諢���� ��圉�趣�� 篞賈ㄨ ������';
+$labels['grouprename'] = '篞賈ㄨ ��渠�� 諻�篨資萼';
+$labels['groupdelete'] = '篞賈ㄨ ��原��';
+$labels['groupremoveselected'] = '篞賈ㄨ������ ��������� ��圉�趣�� ���穇�';
 $labels['previouspage'] = '��渥�� ��貲�� 貐湊萼';
 $labels['firstpage'] = '麮���� ��貲�� 貐湊萼';
 $labels['nextpage'] = '��木�� ��貲�� 貐湊萼';
 $labels['lastpage'] = '諤�鴔�諤� ��貲�� 貐湊萼';
+$labels['group'] = '篞賈ㄨ';
 $labels['groups'] = '篞賈ㄨ';
 $labels['personaladrbook'] = '穈���� 鴥潰��';
 $labels['import'] = '穈���賄�曰萼';
@@ -186,6 +283,7 @@ $labels['importreplace'] = '���麮� 鴥潰��諢���� 諻�篹�';
 $labels['importtext'] = '��圉�趣����木�� 穈�鴔�窸� ������ 鴥潰��諢������� 穈���賄�� ��� �����蛟�����.<br/> �����禺�� <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ��禺孚������ 穈���賄�曰萼諝� 鴔������拘�����.';
 $labels['done'] = '���諴�';
 $labels['settingsfor'] = '��木��';
+$labels['about'] = '��湊�����...';
 $labels['preferences'] = '���窶� ��木��';
 $labels['userpreferences'] = '��科�拖�� ���窶�';
 $labels['editpreferences'] = '��科�拖�� ���窶� ��賄��';
@@ -195,7 +293,10 @@ $labels['newidentity'] = '��� ������';
 $labels['newitem'] = '��� �����渣��';
 $labels['edititem'] = '�����渣�� ��賄��';
 $labels['preferhtml'] = 'HTML 貐渥�湊萼';
+$labels['defaultcharset'] = '篣圉雩 諡賄�� ��貲��';
 $labels['htmlmessage'] = 'HTML 諰����鴔�';
+$labels['dateformat'] = '���鴔� ������';
+$labels['timeformat'] = '���穈� ������';
 $labels['prettydate'] = '���鴔� ������';
 $labels['setdefault'] = '篣圉雩��潺�� ��木��';
 $labels['autodetect'] = '������';
@@ -205,6 +306,7 @@ $labels['pagesize'] = '�����渥����� 鴗� ���';
 $labels['signature'] = '���諈�';
 $labels['dstactive'] = '���諟貲�����';
 $labels['htmleditor'] = 'HTML 諰���� ��國萼';
+$labels['htmlonreply'] = 'HTML 諰����鴔���� ��������� ������ 諤�';
 $labels['htmlsignature'] = 'HTML ���諈�';
 $labels['previewpane'] = '��渥�� 窱科�� 貐湊萼';
 $labels['skin'] = '��貲�堅����渥�� ��欠��';
@@ -220,6 +322,8 @@ $labels['ignore'] = '諡渥��';
 $labels['readwhendeleted'] = '��原����� ��� 諰����鴔�諝� ��趣�� 窶���潺�� ������';
 $labels['flagfordeletion'] = '鴔���圉�� ������ 鴔���� 諰����鴔���� 篧�諻� ��禹萼';
 $labels['skipdeleted'] = '鴔���� 諰����鴔� 貐渥�渥�� ���篣�';
+$labels['deletealways'] = '��渥����蛙�潺�� 諰����鴔� ��渠����� ��欠�刮��諰�, ��原��';
+$labels['deletejunk'] = '������ 諰���潤�到�� ������ 諰����鴔���木�� 諻�諢� ��原��';
 $labels['showremoteimages'] = '���窶� ��渠站鴔� 貐渥�湊萼';
 $labels['fromknownsenders'] = '������ 諻������賄��窶����諤�';
 $labels['always'] = '��原��';
@@ -228,15 +332,39 @@ $labels['autosavedraft'] = '������������ ������ ������';
 $labels['everynminutes'] = '$n 賱�諤����';
 $labels['keepalive'] = '��木�� 穈�窶拘����� ��� 諰����鴔� ������ 麮渣��';
 $labels['never'] = '���鴔� ������';
+$labels['immediately'] = '鴞����';
 $labels['messagesdisplaying'] = '諰����鴔� ������ 鴗�';
 $labels['messagescomposition'] = '諰����鴔� ������ 鴗�';
 $labels['mimeparamfolding'] = '麮刺�� ������ ��渠��';
 $labels['2231folding'] = 'Full RFC 2231 (������貒����)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS ������諴�)';
 $labels['2047folding'] = 'Full RFC 2047 (��月斥 ���諢�篞賈�刺��)';
+$labels['force7bit'] = '8-bit 諡賄����木�� �����渥�� MIME ��賄����拖�� ��科��';
 $labels['advancedoptions'] = '������ ��木��';
 $labels['focusonnewmessage'] = '��� 諰����鴔�穈� �����潺庖 賳���潰�域�� ��������圉�� ��科誘��� ��渠��';
 $labels['checkallfolders'] = '��� 諰����鴔�諝� ������ 諈刺�� ��渠�� 麮渣��';
+$labels['displaynext'] = '諰����鴔� ��原��/��渠����� ��������� ��木�� 諰����鴔�諝� ������';
+$labels['defaultfont'] = 'HTML 諰����鴔���� 篣圉雩 ��堅��';
+$labels['mainoptions'] = '鴥� ��蛙��';
+$labels['browseroptions'] = '賳���潰�域�� ��蛙��';
+$labels['section'] = '��寢��';
+$labels['maintenance'] = '���鴔� 窵�謔�';
+$labels['newmessage'] = '��� 諰����鴔�';
+$labels['signatureoptions'] = '���諈� ��蛙��';
+$labels['autoaddsignature'] = '��������潺�� ���諈� 黺�穈�';
+$labels['newmessageonly'] = '���諢���� 諰����鴔�諤�';
+$labels['replyandforwardonly'] = '��������渠�� ������ 諰����鴔� 諤�';
+$labels['insertsignature'] = '���諈� ��趣��';
+$labels['previewpanemarkread'] = '諯賈收 ��踫�� 諰����鴔�諝� ��趣����潺�� ������';
+$labels['afternseconds'] = '$n 黕� ��渣��';
+$labels['reqmdn'] = '��原�� ������������ ���麮� ���篣�';
+$labels['defaultaddressbook'] = '��������� 鴥潰��諢���� ���諢���� ��圉�趣��諝� 黺�穈�';
+$labels['spellcheckbeforesend'] = '諰����鴔�諝� 貐渠�湊萼 ������ 諤�黺月�� ������';
+$labels['spellcheckoptions'] = '諤�黺月�� ������ ��蛙��';
+$labels['spellcheckignoresyms'] = '��禺頃��� ��秒�刺�� ��到�� 諡渥�����篣�';
+$labels['spellcheckignorenums'] = '��恢��穈� ��秒�刺�� ��到�� 諡渥�����篣�';
+$labels['spellcheckignorecaps'] = '���諡賄��穈� ��秒�刺�� ��到�� 諡渥�����篣�';
+$labels['addtodict'] = '��科����� 黺�穈�';
 $labels['folder'] = '��渠��';
 $labels['foldername'] = '��渠�� ��渠��';
 $labels['subscribed'] = '穈�������';
@@ -245,11 +373,34 @@ $labels['create'] = '諤���曰萼';
 $labels['createfolder'] = '��� ��渠�� 諤���曰萼';
 $labels['managefolders'] = '��渠�� 窵�謔�';
 $labels['specialfolders'] = '��寢�� ��渠��';
+$labels['properties'] = '��梵�� ���貐�';
+$labels['folderproperties'] = '��渠�� ��梵�� ���貐�';
+$labels['parentfolder'] = '������ ��渠��';
+$labels['info'] = '���貐�';
+$labels['getfoldersize'] = '��渠����� ��科�渥��諝� ������貐渠�月庖 ��渠早';
+$labels['changesubscription'] = '窱禺����� 貐�窶踫����月庖 ��渠早';
+$labels['foldertype'] = '��渠�� ������';
+$labels['personalfolder'] = '穈���� ��渠��';
+$labels['otherfolder'] = '��月斥 ��科�拖����� ��渠��';
+$labels['sharedfolder'] = '窸虛�� ��渠��';
 $labels['sortby'] = '������';
 $labels['sortasc'] = '��月��麆到����潺�� ������';
 $labels['sortdesc'] = '��渠汝麆到����潺�� ������';
+$labels['undo'] = '��欠�� 鼒到��';
+$labels['plugin'] = '�����禹溢���';
+$labels['version'] = '貒����';
+$labels['license'] = '��潰�渥�潰��';
+$labels['support'] = '鴔���� 諻�篣�';
 $labels['B'] = '諻���渣��';
 $labels['KB'] = '��禺��諻���渣��';
 $labels['MB'] = '諰�穈�諻���渣��';
 $labels['GB'] = '篣國��諻���渣��';
+$labels['unicode'] = '������儠����(��到�� 儠����,��曰筏��� 鴔����儠����)';
+$labels['english'] = '������';
+$labels['turkish'] = '��堅�木��';
+$labels['thai'] = '���窱原��';
+$labels['vietnamese'] = '貒���賈�到��';
+$labels['japanese'] = '��潺雩���';
+$labels['korean'] = '���窱原��';
+$labels['chinese'] = '鴗�窱原��';
 
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index 64c2181b5..c1936dbd0 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -9,20 +9,29 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = '諢�篞賄�� ��欠��';
+$messages['errortitle'] = '�����禹�� 諻����!';
+$messages['loginfailed'] = '諢�篞賄�賄�� ��欠�刮�������蛟�����.';
 $messages['cookiesdisabled'] = '賳���潰�域��穈� 勴���月未 鴔�������鴔� �����蛟�����';
 $messages['sessionerror'] = '��賄����� �����刮��鴔� ���穇圉�� 鮈�諴���������蛟�����';
 $messages['storageerror'] = 'IMAP ���貒� ��國盒 ��欠��';
+$messages['servererror'] = '���貒� ������!';
+$messages['servererrormsg'] = '���貒� ������: $msg';
+$messages['dberror'] = '��域�渣�圉����渥�� ������!';
+$messages['requesttimedout'] = '���麮� ���穈� 黕�窸�';
+$messages['errorreadonly'] = '諈���寢�� ��������� ��� �����蛟�����. ��赭萼������ ��渠��.';
+$messages['errornoperm'] = '諈���寢�� ��������� ��� �����蛟�����. 窷������� 穇圉�� ���.';
+$messages['invalidrequest'] = '���諈骰�� ���麮�! ��域�渣�圉�� �����伙��鴔� ���������.';
 $messages['nomessagesfound'] = '��� 諰���潤�到�� 諰���潰�� �����蛟�����';
 $messages['loggedout'] = '��賄����� ��梓陬�����潺�� 鮈�諴���������蛟�����. ��������� 穈���原�����!';
 $messages['mailboxempty'] = '諰���潤�到�� 赬���渥����蛟�����';
 $messages['loading'] = '賱���科�月�� 鴗�...';
+$messages['uploading'] = '��������� ������ ��禺收篣�...';
+$messages['uploadingmany'] = '��禺�� ������ ��禺收篣�...';
 $messages['loadingdata'] = '��域�渣�� 賱���科�月�� 鴗�...';
 $messages['checkingmail'] = '��� 諰���� ������ 鴗�...';
 $messages['sendingmessage'] = '諰���� 貐渠�渠�� 鴗�...';
@@ -32,22 +41,31 @@ $messages['messagesaved'] = '諰���潰�� ������������ ��渠����� �����伙�������蛟��
 $messages['successfullysaved'] = '��梓陬�����潺�� ������';
 $messages['addedsuccessfully'] = '��圉�趣��穈� 鴥潰��諢���� ��梓陬�����潺�� 黺�穈���������蛟�����';
 $messages['contactexists'] = '��� 諰���潺�� 鴔������� ��圉�趣��穈� ��渠站 �����蛟�����';
+$messages['contactnameexists'] = '��渠站 魽渥�秒����� 窶�窸� �����潤�� ��渠����� ��圉�趣��.';
 $messages['blockedimages'] = '貐渥�� ���鴔�諝� ������, ��� 諰���潰�� ��賈�� ��渠站鴔�諝� 麆刺�刮�������蛟�����';
 $messages['encryptedmessage'] = '��� 諰���潰�� �����貲�������� 貐� ��� �����蛟�����. 鴥���∮�拘�����!';
 $messages['nocontactsfound'] = '��圉�趣�� ������';
 $messages['contactnotfound'] = '���麮厝�� ��圉�趣��穈� �����蛟�����';
+$messages['contactsearchonly'] = '��圉�趣��諝� 麆樽萼 ������ 窶���� ��卿版��� �����伕����賄��.';
 $messages['sendingfailed'] = '諰���潰�� 貐渠�渥�� 諈魁����蛟�����';
 $messages['senttooquickly'] = '��� 諰����鴔�諝� 貐渠�湊萼 ������ $sec 黕� ������ 篣圉�月收��原�����.';
 $messages['errorsavingsent'] = '貐渠�� 諰����鴔�諝� �����伕�� ��� �����禹�� 諻���������蛟�����.';
 $messages['errorsaving'] = '������ 鴗� �����禹�� 諻���������蛟�����';
 $messages['errormoving'] = '諰���潰�� ��栓虜 ��� �����蛟�����';
+$messages['errorcopying'] = '諰����鴔�(���)諝� 貐蛙�秒�� ��� �����蛟�����.';
 $messages['errordeleting'] = '諰���潰�� 鴔���� ��� �����蛟�����';
+$messages['errormarking'] = '諰����鴔�(���)��� ��������� ��� �����蛟�����.';
 $messages['deletecontactconfirm'] = '���諤� ��������� ��圉�趣����木�� ��原��������窶���蛟��篧�?';
+$messages['deletegroupconfirm'] = '���諤�諢� ��������� 篞賈ㄨ��� ��原�������� 窶���� ��������卿��篧�?';
 $messages['deletemessagesconfirm'] = '���諤� ��������� 諰���潺�木�� ��原��������窶���蛟��篧�?';
 $messages['deletefolderconfirm'] = '���諤� ��� ��渠��諝� ��原��������窶���蛟��篧�?';
 $messages['purgefolderconfirm'] = '���諤� ��� ��渠����� 諈刺�� 諰���潰�� ��原��������窶���蛟��篧�?';
+$messages['contactdeleting'] = '��圉�趣��(���) ��原�� 鴗�...';
+$messages['groupdeleting'] = '篞賈ㄨ ��原�� 鴗�...';
 $messages['folderdeleting'] = '��渠�� 鴔���圉�� 鴗�...';
 $messages['foldermoving'] = '��渠�� ��栓萼��� 鴗�...';
+$messages['foldersubscribing'] = '��渠����� 窱禺����� �����桶�� ������ 鴗�...';
+$messages['folderunsubscribing'] = '��渠����� 窱禺����� 鼒到�������� 鴗�...';
 $messages['formincomplete'] = '��������� ��������� 麇���域�� ��������蛟�����';
 $messages['noemailwarning'] = '�����刮�� ��渠����� 鴥潰��諝� �����渥ˉ��原�����';
 $messages['nonamewarning'] = '��渠����� �����渥ˉ��原�����';
@@ -59,12 +77,18 @@ $messages['nobodywarning'] = '�����欠�� ������ 諰���潰�� 貐渠�澎�����?';
 $messages['notsentwarning'] = '諰���潰�� 貐渠�渥�� ��������蛟�����. 諰���潰�� 貒�謔科��窶���蛟��篧�?';
 $messages['noldapserver'] = '窶������� LDAP ���貒�諝� �����������賄��';
 $messages['nosearchname'] = '��圉�趣�� ��渠����渠�� 諰���� 鴥潰��諝� �����潰�賄��';
+$messages['notuploadedwarning'] = '���鴔� 諈刺�� 麮刺��穈� ���諢�������鴔� ��������蛟�����. 篣圉�月收穇圉�� ���諢����諝� 鼒到�����篣� 諻����������.';
 $messages['searchsuccessful'] = '$nr穈���� 諰���� 諻�窶�';
+$messages['contactsearchsuccessful'] = '$nr ��圉�趣�� 諻�窶禺��.';
 $messages['searchnomatch'] = '窶���� 窶國頃穈� �����蛟�����';
 $messages['searching'] = '窶���� 鴗�...';
 $messages['checking'] = '麮渣�� 鴗�...';
 $messages['nospellerrors'] = '��欠��諤� �����禹�� �����蛟�����';
 $messages['folderdeleted'] = '��渠��諝� ��梓陬�����潺�� ��原����������蛟�����';
+$messages['foldersubscribed'] = '��渠��穈� ��梓陬�����潺�� 窱禺�� ���.';
+$messages['folderunsubscribed'] = '��渠��穈� ��梓陬�����潺�� 窱禺�� 鼒到�� ���.';
+$messages['folderpurged'] = '��渠��穈� ��梓陬�����潺�� 赬����魽���蛟�����.';
+$messages['folderexpunged'] = '��渠��穈� ��梓陬�����潺�� ���黺� ��������蛟�����.';
 $messages['deletedsuccessfully'] = '��梓陬�����潺�� ��原����������蛟�����';
 $messages['converting'] = '諰���潰�� ��禺孚��� 鴔���圉�� 鴗�...';
 $messages['messageopenerror'] = '���貒������� 諰���潰�� 穈���賄�� ��� �����蛟�����';
@@ -75,16 +99,54 @@ $messages['copyerror'] = '鴥潰��諝� 貐蛙�秒�� ��� �����蛟�����';
 $messages['sourceisreadonly'] = '��� 鴥潰�� �����月�� ��赭萼 �����拖��������';
 $messages['errorsavingcontact'] = '��圉�趣�� 鴥潰��諝� �����伕�� ��� �����蛟�����';
 $messages['movingmessage'] = '諰����鴔� ��渠�� 鴗�...';
+$messages['copyingmessage'] = '諰����鴔�(���) 貐蛙�� 鴗�...';
+$messages['copyingcontact'] = '��圉�趣��(���) 貐蛙�� 鴗�...';
+$messages['deletingmessage'] = '諰����鴔�(���) ��原�� 鴗�...';
+$messages['markingmessage'] = '諰����鴔�(���)��� ������ 鴗�...';
+$messages['addingmember'] = '篞賈ㄨ��� ��圉�趣��(���)��� 黺�穈� 鴗�...';
+$messages['removingmember'] = '篞賈ㄨ��潺�� 賱���� ��圉�趣��諝� ��原�� 鴗�...';
 $messages['receiptsent'] = '諰���� ��趣�� �����賄�� 貐渠����蛟�����';
 $messages['errorsendingreceipt'] = '��趣�� �����賄�� 貐渠�� ��� �����蛟�����';
 $messages['nodeletelastidentity'] = '��� ���貐渠�� 諤�鴔�諤� ��到�� 窶���渠��諢� 鴔���� ��� �����蛟�����';
 $messages['forbiddencharacter'] = '��渠�� ��渠����� ��� ��� ������ 諡賄��穈� ��秒�刺����� �����蛟�����';
 $messages['selectimportfile'] = '���諢������� �����潰�� �����������賄��';
 $messages['addresswriterror'] = '��������� 鴥潰��諢���� ��� ��� �����蛟�����';
+$messages['contactaddedtogroup'] = '��� 篞賈ㄨ��� ��圉�趣��諝� ��梓陬�����潺�� 黺�穈� ���.';
+$messages['contactremovedfromgroup'] = '��� 篞賈ㄨ��潺�� 賱���� ��圉�趣��諝� ��梓陬�����潺�� ���穇� ���.';
 $messages['importwait'] = '穈���賄�月�� 鴗�, 篣圉�月收��賄��...';
 $messages['importerror'] = '穈���賄�曰萼 ��欠��! ���諢������� �����潰�� �����刮�� vCard �����潰�� ������������.';
 $messages['importconfirm'] = '<b>$inserted ��圉�趣��諝� ��梓陬�����潺�� 穈���賄��窸�, $skipped 魽渥�秒����� ��卿版��� 穇渠����域����蛟�����.</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = '��������� ���穈����鴔� ��������蛟�����!';
 $messages['nofromaddress'] = '��������� ��������� ��渠����� 鴥潰��穈� ������';
 $messages['editorwarning'] = '��潺�� �����欠�� ��賄��篣圉�� 諻�篨賈庖 諈刺�� ��������� ��禺�潰��������. 窸�������篧����?';
+$messages['httpreceivedencrypterror'] = '儦�諈������� ��木�� ��月��穈� 諻���� ���������. 窵�謔科�����窶� 諻�諢� ��圉�趣�� 鼒刮����賄��.<b>諰����鴔�諝� �����∮�� ��� �����蛟�����.</b>';
+$messages['smtpconnerror'] = 'SMTP ������ ($code): ���貒�諢���� ��國盒��� ��欠�� ���.';
+$messages['smtpautherror'] = 'SMTP ������ ($code): ��賄����� ��欠�� ���.';
+$messages['smtpfromerror'] = 'SMTP ������ ($code): 貐渠�� ��禺����� "$from"諢� ��木�������� 窶���� ��欠�� ��� ($msg).';
+$messages['smtptoerror'] = 'SMTP ������ ($code): ��������� "$to"諝� 黺�穈������� ��� ��欠�� ��� ($msg).';
+$messages['smtprecipientserror'] = 'SMTP ������: ��������� 諈拘����� 賱����(parse)��� ��� ������.';
+$messages['smtperror'] = 'SMTP ������: $msg';
+$messages['emailformaterror'] = '���諈骰�� e-mail 鴥潰��: $email';
+$messages['toomanyrecipients'] = '���������穈� ���諡� 諤���蛟�����. ������������ ���諝� $max諢� 鴗���渥�賄��.';
+$messages['maxgroupmembersreached'] = '篞賈ㄨ 窱科�桿����� ���穈� 黖���� ��賄�� $max諝� 黕�窸潤�������蛟�����.';
+$messages['internalerror'] = '��渠�� ��月��穈� 諻������������蛟�����. ��木�� ���������篣� 諻����������.';
+$messages['contactdelerror'] = '��圉�趣��(���)��� 鴔���� ��� �����蛟�����.';
+$messages['contactdeleted'] = '��圉�趣��(���)��� ��梓陬�����潺�� ���穇� ���.';
+$messages['contactrestoreerror'] = '��原����� ��圉�趣��(���)��� 貐虛筋��� ��� ������.';
+$messages['contactrestored'] = '��圉�趣��(���)��� ��梓陬�����潺�� 貐虛筋 ���.';
+$messages['groupdeleted'] = '篞賈ㄨ��� ��梓陬�����潺�� ��原�� ���.';
+$messages['grouprenamed'] = '篞賈ㄨ諈���� ��梓陬�����潺�� 貐�窶� ���.';
+$messages['groupcreated'] = '篞賈ㄨ��� ��梓陬�����潺�� ������ ���.';
+$messages['messagedeleted'] = '諰����鴔�(���)��� ��梓陬�����潺�� ��原�� ���.';
+$messages['messagemoved'] = '諰����鴔�(���)��� ��梓陬�����潺�� ��渠�� ���.';
+$messages['messagecopied'] = '諰����鴔�(���)��� ��梓陬�����潺�� 貐蛙�� ���.';
+$messages['messagemarked'] = '諰����鴔�(���)��� ��梓陬�����潺�� ������ ���.';
+$messages['autocompletechars'] = '������ �����桿�� �����渥�� �����渠�� $min 篣����諝� �����伕����賄��.';
+$messages['namecannotbeempty'] = '��渠����� 赬������賄����� �����拘�����.';
+$messages['nametoolong'] = '��渠����� ���諡� 篧�������.';
+$messages['folderupdated'] = '��渠��諝� ��梓陬�����潺�� 穈桿�� ���.';
+$messages['foldercreated'] = '��渠��諝� ��梓陬�����潺�� ������ ���.';
+$messages['invalidimageformat'] = '��禺��諝� ��渠站鴔� ��禺岱��� ������.';
+$messages['mispellingsfound'] = '諰����鴔������� 諤�黺月�� ��月��諝� 穈�鴔� ���������.';
+$messages['parentnotwritable'] = '��������� 賱�諈� ��渠����� ��渠��諝� �����桶��穇圉�� ��渠����� ��� ������. ���篞� 窷������� ������.';
 
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 6e8311a58..b83ffcfe4 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Rimas Kudelis <rq@akl.lt>                                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Nepavyko prisijungti prie IMAP serverio.';
 $messages['servererror'] = 'Serverio klaida!';
 $messages['servererrormsg'] = 'Serverio klaida: $msg';
 $messages['dberror'] = 'Duomen鑒 baz��s klaida!';
+$messages['requesttimedout'] = 'Baig��si u鱉klausai skirtas laikas';
 $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo ��� aplankas prieinamas tik skaitymui.';
 $messages['errornoperm'] = 'Nepavyko atlikti veiksmo ��� nepakanka teisi鑒.';
 $messages['invalidrequest'] = 'Netinkama u鱉klausa! Duomenys nei禳saugoti.';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 3fd2c413e..a16885d6c 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | localization/ml_ML/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: midhun <orisis47@gmail.com>                                   |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 4fb27a36e..3e4b4d5da 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/messages.inc                                       |
+ | localization/ml_ML/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Anish A <aneesh.nl@gmail.com>                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 79a688440..39a85245a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
+ | Author: Geert Wirken                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -154,7 +153,7 @@ $labels['arrival'] = 'Aankomst datum';
 $labels['asc'] = 'oplopend';
 $labels['desc'] = 'aflopend';
 $labels['listcolumns'] = 'Kolommen';
-$labels['listsorting'] = 'Sorteerkolom';
+$labels['listsorting'] = 'Sorteer op kolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Weergavemodus';
 $labels['folderactions'] = 'Acties voor map...';
@@ -173,7 +172,7 @@ $labels['editasnew'] = 'Als nieuw bewerken';
 $labels['savemessage'] = 'Bewaar als concept';
 $labels['sendmessage'] = 'Verstuur het bericht nu';
 $labels['addattachment'] = 'Voeg een bijlage toe';
-$labels['charset'] = 'Karakterset';
+$labels['charset'] = 'Tekenset';
 $labels['editortype'] = 'Opmaak';
 $labels['returnreceipt'] = 'Ontvangstbevestiging';
 $labels['dsn'] = 'Afleveringsbericht (DSN)';
@@ -267,7 +266,7 @@ $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Contact eigenschappen';
 $labels['personalinfo'] = 'Persoonlijke informatie';
 $labels['edit'] = 'Wijzig';
-$labels['cancel'] = 'Annuleer';
+$labels['cancel'] = 'Annuleren';
 $labels['save'] = 'Opslaan';
 $labels['delete'] = 'Verwijder';
 $labels['rename'] = 'Hernoem';
@@ -312,11 +311,11 @@ $labels['newidentity'] = 'Identiteit toevoegen';
 $labels['newitem'] = 'Nieuw item';
 $labels['edititem'] = 'Wijzig item';
 $labels['preferhtml'] = 'Toon HTML';
-$labels['defaultcharset'] = 'Standaard karakterset';
+$labels['defaultcharset'] = 'Standaard tekenset';
 $labels['htmlmessage'] = 'HTML-bericht';
 $labels['dateformat'] = 'Datumnotatie';
 $labels['timeformat'] = 'Tijdweergave';
-$labels['prettydate'] = 'Gebruiksvriendelijke data';
+$labels['prettydate'] = 'Leesbare datums';
 $labels['setdefault'] = 'Stel in als standaard';
 $labels['autodetect'] = 'Automatisch';
 $labels['language'] = 'Taal';
@@ -335,23 +334,23 @@ $labels['uisettings'] = 'Gebruikersinterface';
 $labels['serversettings'] = 'Serverinstellingen';
 $labels['mailboxview'] = 'Mailboxweergave';
 $labels['mdnrequests'] = 'Ontvangstmeldingen';
-$labels['askuser'] = 'vraag de gebruiker';
+$labels['askuser'] = 'altijd aan mij vragen';
 $labels['autosend'] = 'stuur automatisch';
 $labels['autosendknown'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen, voor anderen aan mij vragen';
 $labels['autosendknownignore'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen,  voor anderen negeren';
-$labels['ignore'] = 'negeer';
+$labels['ignore'] = 'negeren';
 $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
 $labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
 $labels['deletejunk'] = 'Verwijder direct berichten in Spam';
-$labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
-$labels['fromknownsenders'] = 'Van bekende afzenders';
+$labels['showremoteimages'] = 'Afbeeldingen op afstand weergeven';
+$labels['fromknownsenders'] = 'van bekende afzenders';
 $labels['always'] = 'altijd';
-$labels['showinlineimages'] = 'Toon bijgevoegde afbeeldingen onder het bericht';
+$labels['showinlineimages'] = 'Bijgevoegde afbeeldingen onder het bericht weergeven';
 $labels['autosavedraft'] = 'Concept automatisch opslaan';
 $labels['everynminutes'] = 'iedere $n minuten';
-$labels['keepalive'] = 'Controleer op nieuwe berichten';
+$labels['keepalive'] = 'Op nieuwe berichten controleren';
 $labels['never'] = 'nooit';
 $labels['immediately'] = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichtenweergave';
@@ -363,8 +362,8 @@ $labels['2047folding'] = 'Volledig RFC 2047 (andere)';
 $labels['force7bit'] = 'Gebruik MIME-codering voor 8-bit karakters';
 $labels['advancedoptions'] = 'Geavanceerde opties';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
-$labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
-$labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
+$labels['checkallfolders'] = 'In alle mappen op nieuwe berichten controleren';
+$labels['displaynext'] = 'Ga naar volgend bericht na verwijderen of verplaatsen';
 $labels['defaultfont'] = 'Standaardlettertype voor HTML-berichten';
 $labels['mainoptions'] = 'Hoofdopties';
 $labels['browseroptions'] = 'Browserinstellingen';
@@ -388,8 +387,8 @@ $labels['afternseconds'] = 'Na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
 $labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
-$labels['defaultaddressbook'] = 'Voeg nieuw contactpersoon toe aan geselecteerd adresboek';
-$labels['autocompletesingle'] = 'Sla alternatieve e-mailadressen over bij automatisch aanvullen';
+$labels['defaultaddressbook'] = 'Nieuwe contactpersonen toevoegen aan gekozen adresboek';
+$labels['autocompletesingle'] = 'Alternatieve e-mailadressen niet gebruiken bij automatisch aanvullen';
 $labels['listnamedisplay'] = 'Contactpersonen weergeven als';
 $labels['spellcheckbeforesend'] = 'Controleer spelling voor het versturen van een bericht';
 $labels['spellcheckoptions'] = 'Instellingen spellingscontrole';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 5b422626f..367b9197d 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
+ | Author: Geert Wirken                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
+$messages['requesttimedout'] = 'Opdracht duurde te lang';
 $messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
@@ -85,8 +85,8 @@ $messages['searching'] = 'Zoeken...';
 $messages['checking'] = 'Controleren...';
 $messages['nospellerrors'] = 'Geen spelfouten gevonden.';
 $messages['folderdeleted'] = 'Map successvol verwijderd.';
-$messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
-$messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
+$messages['foldersubscribed'] = 'Succesvol geabonneerd op map.';
+$messages['folderunsubscribed'] = 'Abonnement op map succesvol opgezegd.';
 $messages['folderpurged'] = 'Folder met succes geleegd.';
 $messages['folderexpunged'] = 'Folder succesvol geleegd.';
 $messages['deletedsuccessfully'] = 'Met succes verwijderd.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 952d65566..92da1f6ef 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pp/bs <Unknown>                                               |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -96,7 +95,7 @@ $labels['longdec'] = 'grudzie��';
 $labels['today'] = 'Dzisiaj';
 $labels['refresh'] = 'Od��wie髒';
 $labels['checkmail'] = 'Sprawd驕 skrzynk��';
-$labels['compose'] = 'Utw籀rz wiadomo����';
+$labels['compose'] = 'Utw籀rz';
 $labels['writenewmessage'] = 'Utw籀rz now�� wiadomo����';
 $labels['reply'] = 'Odpowiedz';
 $labels['replytomessage'] = 'Odpowiedz nadawcy';
@@ -116,7 +115,7 @@ $labels['nextmessage'] = 'Nast��pna wiadomo����';
 $labels['lastmessage'] = 'Ostatnia wiadomo����';
 $labels['backtolist'] = 'Poka髒 list�� wiadomo��ci';
 $labels['viewsource'] = 'Poka髒 驕r籀d��o';
-$labels['mark'] = 'Zaznacz';
+$labels['mark'] = 'Oznacz';
 $labels['markmessages'] = 'Oznacz wiadomo��ci';
 $labels['markread'] = 'Jako przeczytane';
 $labels['markunread'] = 'Jako nieprzeczytane';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index e82c5b9e9..9593ba478 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'B����d po����czenia z serwerem!';
 $messages['servererror'] = 'B����d serwera!';
 $messages['servererrormsg'] = 'B����d serwera: $msg';
 $messages['dberror'] = 'B����d bazy danych!';
+$messages['requesttimedout'] = 'Up��yn���� limit czasu 髒��dania';
 $messages['errorreadonly'] = 'Nie mo髒na wykona�� operacji. Folder tylko do odczytu.';
 $messages['errornoperm'] = 'Nie mo髒na wykona�� operacji. Brak uprawnie��.';
 $messages['invalidrequest'] = 'B����dne 髒��danie! Nie zapisano danych.';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 2c8a3595c..5abdf205d 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -22,7 +21,7 @@ $labels['server'] = 'Servidor';
 $labels['login'] = 'Entrar';
 $labels['logout'] = 'Sair';
 $labels['mail'] = 'E-mail';
-$labels['settings'] = 'Configura癟繭es pessoais';
+$labels['settings'] = 'Configura癟繭es';
 $labels['addressbook'] = 'Cat獺logo de endere癟os';
 $labels['inbox'] = 'Caixa de entrada';
 $labels['drafts'] = 'Rascunhos';
@@ -33,7 +32,7 @@ $labels['subject'] = 'Assunto';
 $labels['from'] = 'De';
 $labels['to'] = 'Para';
 $labels['cc'] = 'C籀pia';
-$labels['bcc'] = 'C籀pia Oculta (Bcc)';
+$labels['bcc'] = 'C籀pia Oculta (Cco)';
 $labels['replyto'] = 'Responder para';
 $labels['followupto'] = 'Encaminhar para';
 $labels['date'] = 'Data';
@@ -55,7 +54,7 @@ $labels['download'] = 'Baixar';
 $labels['filename'] = 'Nome do arquivo';
 $labels['filesize'] = 'Tamanho';
 $labels['addtoaddressbook'] = 'Incluir no cat獺logo de endere癟os';
-$labels['sun'] = 'Dom';
+$labels['sun'] = 'Dom.';
 $labels['mon'] = 'Seg.';
 $labels['tue'] = 'Ter.';
 $labels['wed'] = 'Qua.';
@@ -96,7 +95,7 @@ $labels['longdec'] = 'Dezembro';
 $labels['today'] = 'Hoje';
 $labels['refresh'] = 'Atualizar';
 $labels['checkmail'] = 'Verificar se h獺 novas mensagens';
-$labels['compose'] = 'Escrever mensagem';
+$labels['compose'] = 'Criar email';
 $labels['writenewmessage'] = 'Criar nova mensagem';
 $labels['reply'] = 'Responder';
 $labels['replytomessage'] = 'Responder para o remetente';
@@ -120,8 +119,8 @@ $labels['mark'] = 'Marcar';
 $labels['markmessages'] = 'Marcar mensagens';
 $labels['markread'] = 'como lidas';
 $labels['markunread'] = 'como n瓊o lidas';
-$labels['markflagged'] = 'Como marcadas';
-$labels['markunflagged'] = 'Como n瓊o marcadas';
+$labels['markflagged'] = 'Como sinalizadas';
+$labels['markunflagged'] = 'Como n瓊o sinalizadas';
 $labels['moreactions'] = 'Mais a癟繭es...';
 $labels['more'] = 'Mais';
 $labels['back'] = 'Voltar';
@@ -147,7 +146,7 @@ $labels['autoexpand_threads'] = 'Expandir mensagens agrupadas';
 $labels['do_expand'] = 'todos os t籀picos';
 $labels['expand_only_unread'] = 'somente com mensagem(s) n瓊o lidas';
 $labels['fromto'] = 'De/Para';
-$labels['flag'] = 'Marcador';
+$labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recebimento';
@@ -168,9 +167,9 @@ $labels['resetsearch'] = 'Limpar';
 $labels['searchmod'] = 'Op癟繭es da pesquisa';
 $labels['msgtext'] = 'Mensagem inteira';
 $labels['openinextwin'] = 'Abrir em nova janela';
-$labels['emlsave'] = 'Baixar (em .eml)';
+$labels['emlsave'] = 'Baixar (formato .eml)';
 $labels['editasnew'] = 'Editar como novo';
-$labels['savemessage'] = 'Salvar Rascunho';
+$labels['savemessage'] = 'Salvar como Rascunho';
 $labels['sendmessage'] = 'Enviar agora';
 $labels['addattachment'] = 'Anexar um arquivo';
 $labels['charset'] = 'Codifica癟瓊o';
@@ -180,13 +179,13 @@ $labels['dsn'] = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
 $labels['editidents'] = 'Editar identidades';
-$labels['spellcheck'] = 'Soletrar';
+$labels['spellcheck'] = 'Revisar';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edi癟瓊o';
 $labels['revertto'] = 'Reverter para';
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
-$labels['upload'] = 'Enviar';
+$labels['upload'] = 'Enviar arquivo';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close'] = 'Fechar';
 $labels['messageoptions'] = 'Op癟繭es da mensagem...';
@@ -198,7 +197,7 @@ $labels['highest'] = 'Mais alta';
 $labels['nosubject'] = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
-$labels['isdraft'] = 'Esta mensagem 矇 um rascunho';
+$labels['isdraft'] = 'Esta 矇 uma mensagem de rascunho.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Salvar mensagens enviadas em';
@@ -233,7 +232,7 @@ $labels['region'] = 'Estado';
 $labels['country'] = 'Pa穩s';
 $labels['birthday'] = 'Data de nascimento';
 $labels['anniversary'] = 'Anivers獺rio';
-$labels['website'] = 'P獺gina da Web';
+$labels['website'] = 'Site';
 $labels['instantmessenger'] = 'Mensagem instant璽nea (IM)';
 $labels['notes'] = 'Anota癟繭es';
 $labels['male'] = 'masculino';
@@ -256,7 +255,7 @@ $labels['typehomefax'] = 'Fax Residencial';
 $labels['typeworkfax'] = 'Fax do Trabalho';
 $labels['typecar'] = 'Carro';
 $labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
+$labels['typevideo'] = 'V穩deo';
 $labels['typehomepage'] = 'P獺gina pessoal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
@@ -297,7 +296,7 @@ $labels['searchdelete'] = 'Excluir pesquisa';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contatos';
 $labels['importfromfile'] = 'Importar do arquivo:';
-$labels['importtarget'] = 'Adicionar novos contatos para o cat獺logo de endere癟os:';
+$labels['importtarget'] = 'Adicionar novos contatos ao cat獺logo de endere癟os:';
 $labels['importreplace'] = 'Substituir o cat獺logo de endere癟os atual';
 $labels['importtext'] = 'Voc礙 pode enviar contatos de um cat獺logo de endere癟os existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Conclu穩do';
@@ -344,7 +343,7 @@ $labels['readwhendeleted'] = 'Marcar a mensagem como lida ao excluir';
 $labels['flagfordeletion'] = 'Marcar a mensagem para exclus瓊o ao inv矇s de excluir';
 $labels['skipdeleted'] = 'N瓊o exibir mensagens exclu穩das';
 $labels['deletealways'] = 'Excluir as mensagens se mov礙-las para a lixeira falhar';
-$labels['deletejunk'] = 'Excluir diretamente as mensagens no Spam';
+$labels['deletejunk'] = 'Apagar as mensagens da pasta de SPAM sem mov礙-las para a lixeira';
 $labels['showremoteimages'] = 'Exibir imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
@@ -377,13 +376,13 @@ $labels['replytopposting'] = 'iniciar nova mensagem acima da original';
 $labels['replybottomposting'] = 'iniciar nova mensagem abaixo da original';
 $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao respond礙-la';
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
-$labels['newmessageonly'] = 'somente para novas mensagens';
-$labels['replyandforwardonly'] = 'somente respostas e encaminhamentos';
+$labels['newmessageonly'] = 'somente em novas mensagens';
+$labels['replyandforwardonly'] = 'somente em respostas e encaminhamentos';
 $labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
 $labels['belowquote'] = 'abaixo da cita癟瓊o';
 $labels['abovequote'] = 'acima da cita癟瓊o';
 $labels['insertsignature'] = 'Inserir assinatura';
-$labels['previewpanemarkread'] = 'Marcar mensagem pr矇-visualizada como lida';
+$labels['previewpanemarkread'] = 'Marcar mensagens pr矇-visualizadas como lidas';
 $labels['afternseconds'] = 'depois de $n segundos';
 $labels['reqmdn'] = 'Sempre pedir confirma癟瓊o de leitura';
 $labels['reqdsn'] = 'Sempre pedir confirma癟瓊o de entrega';
@@ -395,9 +394,9 @@ $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar uma mens
 $labels['spellcheckoptions'] = 'Op癟繭es do Verificador Ortogr獺fico';
 $labels['spellcheckignoresyms'] = 'Ignorar palavras com s穩mbolos';
 $labels['spellcheckignorenums'] = 'Ignorar palavras com n繳meros';
-$labels['spellcheckignorecaps'] = 'Ignorar palavras toda em mai繳sculo';
+$labels['spellcheckignorecaps'] = 'Ignorar palavras com todas letras mai繳sculas';
 $labels['addtodict'] = 'Adicionar ao dicion獺rio';
-$labels['mailtoprotohandler'] = 'Registrar o tratador de protocolo para mailto: links';
+$labels['mailtoprotohandler'] = 'Associar links de e-mail (mailto:) para envio de mensagem atrav矇s do webmail';
 $labels['folder'] = 'Pasta';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Inscrito';
@@ -408,10 +407,10 @@ $labels['managefolders'] = 'Gerenciar pastas';
 $labels['specialfolders'] = 'Pastas especiais';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
-$labels['parentfolder'] = 'Pasta Pai';
+$labels['parentfolder'] = 'Pasta pai';
 $labels['location'] = 'Localiza癟瓊o';
 $labels['info'] = 'Informa癟瓊o';
-$labels['getfoldersize'] = 'Clique para obter tamanho da pasta';
+$labels['getfoldersize'] = 'Exibir o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para ativar/desativar';
 $labels['foldertype'] = 'Tipo de Pasta';
 $labels['personalfolder'] = 'Pasta Particular';
@@ -425,7 +424,7 @@ $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Vers瓊o';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licen癟a';
-$labels['support'] = 'Buscar suporte';
+$labels['support'] = 'Obter suporte';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 609cb1f91..1022be797 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -19,19 +18,20 @@ $messages['errortitle'] = 'Ocorreu um erro!';
 $messages['loginfailed'] = 'Falha no login';
 $messages['cookiesdisabled'] = 'Seu navegador n瓊o aceita cookies';
 $messages['sessionerror'] = 'A sess瓊o do seu navegador 矇 inv獺lida ou expirou';
-$messages['storageerror'] = 'Falha na conex瓊o com o servidor IMAP';
+$messages['storageerror'] = 'Falha na conex瓊o com o servidor. Verifique se informou os dados corretamente.';
 $messages['servererror'] = 'Erro no Servidor!';
 $messages['servererrormsg'] = 'Erro no Servidor: $msg';
 $messages['dberror'] = 'Erro no banco de dados!';
+$messages['requesttimedout'] = 'Tempo da requisi癟瓊o esgotado';
 $messages['errorreadonly'] = 'N瓊o foi poss穩vel realizar a opera癟瓊o. Pasta somente leitura';
 $messages['errornoperm'] = 'N瓊o foi poss穩vel realizar a opera癟瓊o. Acesso negado';
 $messages['invalidrequest'] = 'Requisi癟瓊o inv獺lida! Nenhum dado foi salvo.';
 $messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
-$messages['loggedout'] = 'Sua sess瓊o foi finalizada com sucesso. At矇 breve!';
+$messages['loggedout'] = 'Sua sess瓊o foi finalizada com sucesso. At矇 logo!';
 $messages['mailboxempty'] = 'A caixa de mensagens est獺 vazia';
 $messages['loading'] = 'Carregando...';
-$messages['uploading'] = 'Carregando arquivo...';
-$messages['uploadingmany'] = 'Carregando arquivos...';
+$messages['uploading'] = 'Enviando arquivo...';
+$messages['uploadingmany'] = 'Enviando arquivos...';
 $messages['loadingdata'] = 'Carregando dados...';
 $messages['checkingmail'] = 'Verificando se h獺 novas mensagens...';
 $messages['sendingmessage'] = 'Enviando mensagem...';
@@ -76,7 +76,7 @@ $messages['nosubjectwarning'] = 'O campo "Assunto" est獺 vazio. Deseja inclu穩-l
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem n瓊o foi enviada. Deseja descartar sua mensagem?';
 $messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
-$messages['nosearchname'] = 'Por favor, informe o nome do contado ou seu endere癟o de e-mail';
+$messages['nosearchname'] = 'Por favor, informe o nome do contato ou seu endere癟o de e-mail.';
 $messages['notuploadedwarning'] = 'H獺 anexos ainda n瓊o enviados. Aguarde ou cancele o envio.';
 $messages['searchsuccessful'] = '$nr mensagens encontradas.';
 $messages['contactsearchsuccessful'] = '$nr contatos encontrados.';
@@ -110,16 +110,16 @@ $messages['errorsendingreceipt'] = 'N瓊o foi poss穩vel enviar a confirma癟瓊o de
 $messages['deleteidentityconfirm'] = 'Voc礙 realmente deseja excluir esta identidade?';
 $messages['nodeletelastidentity'] = 'Voc礙 n瓊o pode excluir sua 繳nica identidade';
 $messages['forbiddencharacter'] = 'O nome da pasta cont矇m um caractere n瓊o permitido';
-$messages['selectimportfile'] = 'Selecione o arquivo para envio';
+$messages['selectimportfile'] = 'Selecione o arquivo a ser enviado.';
 $messages['addresswriterror'] = 'O cat獺logo de endere癟os selecionado n瓊o tem permiss瓊o de modifica癟瓊o';
-$messages['contactaddedtogroup'] = 'Adicionado os contatos a este grupo com sucesso';
-$messages['contactremovedfromgroup'] = 'Removido contatos deste grupo com sucesso';
+$messages['contactaddedtogroup'] = 'Contatos adicionados a este grupo com sucesso.';
+$messages['contactremovedfromgroup'] = 'Contatos removidos deste grupo com sucesso.';
 $messages['importwait'] = 'Importando, aguarde por favor...';
 $messages['importerror'] = 'Falha na importa癟瓊o! O arquivo enviado n瓊o 矇 um arquivo vCard v獺lido.';
 $messages['importconfirm'] = '<b>Foram importados com sucesso $inserted contatos</b>';
 $messages['importconfirmskipped'] = '<b>Ignorado(s) $skipped registro(s) j獺 existente(s)</b>';
 $messages['opnotpermitted'] = 'Opera癟瓊o n瓊o permitida!';
-$messages['nofromaddress'] = 'Falta o endere癟o de email na identidade selecionada';
+$messages['nofromaddress'] = 'Falta o e-mail na identidade selecionada.';
 $messages['editorwarning'] = 'Mudar para o editor de texto simples elimina toda a formata癟瓊o de texto. Deseja continuar?';
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro de configura癟瓊o. Informe ao administrador do sistema imediatamente. <b>Sua mensagem n瓊o pode ser enviada.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Conex瓊o ao servidor falhou.';
@@ -129,7 +129,7 @@ $messages['smtptoerror'] = 'Erro SMTP ($code): Falha ao adicionar o destinat獺ri
 $messages['smtprecipientserror'] = 'Erro SMTP: N瓊o 矇 poss穩vel processar a lista destinat獺rios.';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'Endere癟o de e-mail inv獺lido: $email';
-$messages['toomanyrecipients'] = 'Muitos destinat獺rios. Reduza o n繳mero de destinat獺rios para $max.';
+$messages['toomanyrecipients'] = 'H獺 muitos destinat獺rios. Reduza o n繳mero de destinat獺rios para $max.';
 $messages['maxgroupmembersreached'] = 'O n繳mero de membros do grupo excede o m獺ximo de $max';
 $messages['internalerror'] = 'Ocorreu um erro interno. Por favor tente novamente.';
 $messages['contactdelerror'] = 'N瓊o foi poss穩vel excluir o(s) contato(s).';
@@ -148,13 +148,13 @@ $messages['messagemoved'] = 'Mensagem(s) movida(s) com sucesso';
 $messages['messagecopied'] = 'Mensagem(s) copiada(s) com sucesso';
 $messages['messagemarked'] = 'Mensagem(s) marcada(s) com sucesso';
 $messages['autocompletechars'] = 'Digite pelo menos $min caractere(s) para auto-completar';
-$messages['autocompletemore'] = 'Muitos registros encontrados. Por favor, digite mais caracteres.';
+$messages['autocompletemore'] = 'Mais registros foram encontrados. Por favor, digite mais caracteres.';
 $messages['namecannotbeempty'] = 'Nome n瓊o pode ser vazio';
 $messages['nametoolong'] = 'Nome 矇 muito longo';
 $messages['folderupdated'] = 'Pasta atualizada com sucesso';
 $messages['foldercreated'] = 'Pasta criada com sucesso';
 $messages['invalidimageformat'] = 'Formato de imagem inv獺lido.';
-$messages['mispellingsfound'] = 'Foram detectados erros de ortografia.';
+$messages['mispellingsfound'] = 'Foram detectados erros de ortografia na mensagem.';
 $messages['parentnotwritable'] = 'Sem permiss瓊o para criar/mover a pasta dentro da pasta selecionada.';
-$messages['messagetoobig'] = 'A parte da mensagem 矇 muito grande para ser processada';
+$messages['messagetoobig'] = 'A mensagem 矇 muito grande para ser processada.';
 
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index fca3dfab2..f4c18207d 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
+ | Author: David                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'A liga癟瓊o ao servidor IMAP falhou';
 $messages['servererror'] = 'Erro do Servidor!';
 $messages['servererrormsg'] = 'Erro do Servidor: $msg';
 $messages['dberror'] = 'Erro na base de dados!';
+$messages['requesttimedout'] = 'A solicita癟瓊o expirou';
 $messages['errorreadonly'] = 'N瓊o foi poss穩vel efectuar a opera癟瓊o. A pasta 矇 s籀 de leitura.';
 $messages['errornoperm'] = 'N瓊o tem permiss繭es para efectuar esta opera癟瓊o.';
 $messages['invalidrequest'] = 'Pedido inv獺lido! N瓊o foi guardada nenhuma informa癟瓊o.';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 3abac46e3..8b69d22dd 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vyacheslav Sharmanov <Unknown>                                |
+ | Author: Lanigiro Nainiarku <r00f@itx.com.ua>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -103,7 +102,7 @@ $labels['replytomessage'] = '����赲迮��邽����';
 $labels['replytoallmessage'] = '����赲迮��邽���� 郈郋 ��郈邽��郕�� 邽郅邽 郋��郈��訄赲邽��迮郅�� 邽 赲��迮邾 郈郋郅����訄��迮郅��邾';
 $labels['replyall'] = '����赲迮��邽���� 赲��迮邾';
 $labels['replylist'] = '����赲迮��邽���� 赲 ��郈邽��郋郕 ��訄������郅郕邽';
-$labels['forward'] = '��郈迮����迡';
+$labels['forward'] = '��迮��迮��郅訄����';
 $labels['forwardinline'] = '��迮��迮��郅訄���� 赲 ��迮郅迮 郈邽����邾訄';
 $labels['forwardattachment'] = '��迮��迮��郅訄���� 郕訄郕 赲郅郋迠迮郇邽迮';
 $labels['forwardmessage'] = '��迮��迮��郅訄����';
@@ -284,6 +283,7 @@ $labels['exportvcards'] = '衪郕��郈郋����邽��郋赲訄���� 郕郋郇��訄郕���� 赲 ��郋
 $labels['newcontactgroup'] = '苤郋郱迡訄���� 迣����郈郈�� 郕郋郇��訄郕��郋赲';
 $labels['grouprename'] = '��迮��迮邽邾迮郇郋赲訄���� 迣����郈郈��';
 $labels['groupdelete'] = '苺迡訄郅邽���� 迣����郈郈��';
+$labels['groupremoveselected'] = '苺迡訄郅邽���� 赲��訇��訄郇郇��迮 郕郋郇��訄郕���� 邽郱 迣����郈郈��';
 $labels['previouspage'] = '��郋郕訄郱訄���� 郈��迮迡��迡����邽邿';
 $labels['firstpage'] = '��郋郕訄郱訄���� 郈迮��赲��邿';
 $labels['nextpage'] = '��郋郕訄郱訄���� ��郅迮迡������邽邿';
@@ -343,6 +343,7 @@ $labels['readwhendeleted'] = '��郋邾迮��訄���� 郕訄郕 郈��郋��邽��訄郇郇郋迮 郈�
 $labels['flagfordeletion'] = '��郋邾迮��訄���� 迡郅�� ��迡訄郅迮郇邽�� 赲邾迮����郋 ��迡訄郅迮郇邽��';
 $labels['skipdeleted'] = '��迮 郈郋郕訄郱��赲訄���� ��迡訄郅迮郇郇��迮 ��郋郋訇��迮郇邽��';
 $labels['deletealways'] = '苺迡訄郅������ ��郋郋訇��迮郇邽��, 迮��郅邽 郇迮 郈郋郅����訄迮������ 郈郋邾迮����邽���� 邽�� 赲 郕郋��郱邽郇��';
+$labels['deletejunk'] = '苺迡訄郅������ ��郋郋訇��迮郇邽�� 邽郱 郈訄郈郕邽 苤������ 邾邽郇���� ��郋��郱邽郇��';
 $labels['showremoteimages'] = '��郋郕訄郱��赲訄���� ��迡訄郅迮郇郇��迮 邽郱郋訇��訄迠迮郇邽��';
 $labels['fromknownsenders'] = '郋�� 邽郱赲迮����郇���� 郋��郈��訄赲邽��迮郅迮邿';
 $labels['always'] = '赲��迮迣迡訄';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 9dc0c7360..eeb298279 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vyacheslav Sharmanov <Unknown>                                |
+ | Author: Sergey Dukachev <admin@mfitness.ru>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = '��迮��迡訄��郇郋迮 ��郋迮迡邽郇迮郇邽迮 �� IMAP ���
 $messages['servererror'] = '����邽訇郕訄 ��迮��赲迮��訄!';
 $messages['servererrormsg'] = '����邽訇郕訄 ��迮��赲迮��訄: $msg';
 $messages['dberror'] = '����邽訇郕訄 訇訄郱�� 迡訄郇郇����!';
+$messages['requesttimedout'] = '����迮赲����迮郇郋 赲��迮邾�� 郋迠邽迡訄郇邽�� 郱訄郈��郋��訄';
 $messages['errorreadonly'] = '��迮赲郋郱邾郋迠郇郋 赲��郈郋郅郇邽���� 郋郈迮��訄��邽��. ��訄郈郕訄 迡郋������郈郇訄 ��郋郅��郕郋 迡郅�� ����迮郇邽��';
 $messages['errornoperm'] = '��迮赲郋郱邾郋迠郇郋 赲��郈郋郅郇邽���� 郋郈迮��訄��邽��. ��郋������郈 郱訄郈��迮����郇';
 $messages['invalidrequest'] = '��迮赲迮��郇��邿 郱訄郈��郋��! ��郇��郋��邾訄��邽�� 郇迮 ��郋����訄郇迮郇訄.';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 019d92293..d7e7115ac 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
+ | Author: 銃毯��鈮�銃喪�� 銃�鈮�鈮�鈮�銃晤��銃� <info@pk-soft.tk>       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -36,7 +35,7 @@ $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = '銃毯��鈮�鈮�銃冢��銃韶�� 鈮�銃喪��鈮�';
 $labels['date'] = '銃能��銃晤飯';
-$labels['size'] = '鈮�鈮�鈮�鈮�銃賞雁鈮�鈮�銃�';
+$labels['size'] = '銃毯�����銃韶飧鈮�銃徇飯';
 $labels['priority'] = '銃毯�����銃韶飧鈮�銃�銃冢��鈮�銃�';
 $labels['organization'] = '鈮�銃�鈮�鈮�銃啤��銃晤飯';
 $labels['mailboxlist'] = '銃嗣��鈮�銃賞��銃詮��';
@@ -47,8 +46,8 @@ $labels['copy'] = '銃毯��銃抉韌銃冢�� 銃�銃韶雇鈮�銃�';
 $labels['move'] = '銃�鈮�銃晤飯銃晤��銃�';
 $labels['moveto'] = '銃�鈮�銃� 銃箋雇鈮�銃�...';
 $labels['download'] = '銃嗣��銃�銃� 銃�銃韶雇鈮�銃�';
-$labels['filename'] = '銃�鈮�銃晤�� 銃晤飧';
-$labels['filesize'] = '銃�鈮�銃晤��鈮�鈮� 銃毯��銃韶飧鈮�銃徇飯';
+$labels['filename'] = '銃�鈮�銃晤��鈮�鈮� 銃晤飧';
+$labels['filesize'] = '銃�鈮�銃晤��鈮�鈮� 銃毯�����銃韶飧鈮�銃徇飯';
 $labels['addtoaddressbook'] = '銃賞��銃毯��銃� 銃毯��銃冢陽 銃�銃�鈮� 銃�銃韶雇鈮�銃�';
 $labels['sun'] = '銃�';
 $labels['mon'] = '鈮�';
@@ -207,7 +206,7 @@ $labels['typeblog'] = '銃嗣��銃賞��銃�鈮�';
 $labels['typeprofile'] = '銃毯��銃冢��銃�銃�';
 $labels['addcontact'] = '銃晤�� 鈮�銃嗣雲銃冢��鈮�銃� 銃�銃�鈮� 銃�銃韶雇鈮�銃�';
 $labels['editcontact'] = '銃賞��銃毯��銃晤飯 鈮�鈮�銃晤��鈮� 銃�鈮�銃韶��銃�';
-$labels['contacts'] = '鈮�銃詮��銃嗣雇鈮�銃啤雁鈮�';
+$labels['contacts'] = '鈮�銃嗣雲銃冢��';
 $labels['personalinfo'] = '銃毯��銃能��銃�銃賞��銃� 銃冢��銃韶雁鈮�銃韶��';
 $labels['edit'] = '鈮�銃�鈮�鈮�銃�銃韶陲銃�';
 $labels['cancel'] = '銃�鈮�銃賞��銃�鈮� 銃�銃韶雇鈮�銃�';
@@ -276,9 +275,12 @@ $labels['folder'] = '銃嗣��鈮�銃賞��銃�';
 $labels['foldername'] = '銃嗣��鈮�銃賞��銃詮�� 銃晤飧';
 $labels['subscribed'] = '鈮�鈮�銃詮��銃Ｒ��銃�';
 $labels['messagecount'] = '銃毯陲鈮�鈮�鈮�銃�';
-$labels['create'] = '鈮�鈮�銃能��銃�';
-$labels['createfolder'] = '銃晤�� 銃嗣��鈮�銃賞��銃詮��鈮� 鈮�鈮�銃能雇鈮�銃�';
-$labels['managefolders'] = '銃嗣��鈮�銃賞��銃詮�� 銃�銃賞飧銃徇��銃�銃韶雇銃�';
+$labels['create'] = '銃冢雇銃晤��銃�';
+$labels['createfolder'] = '銃晤�� 銃嗣��鈮�銃賞��銃詮��鈮� 銃冢雇銃晤��銃�';
+$labels['managefolders'] = '銃嗣��鈮�銃賞��銃詮�� 銃�鈮�銃詮雇鈮�銃�銃韶陲銃� 銃�銃韶雇鈮�銃�';
+$labels['specialfolders'] = '鈮�鈮�鈮�鈮�鈮� 銃嗣��鈮�銃賞��銃詮��';
+$labels['properties'] = '鈮�銃冢��銃�銃詮��';
+$labels['folderproperties'] = '銃嗣��鈮�銃賞��銃詮�� 鈮�銃冢��銃�銃詮��';
 $labels['location'] = '鈮�鈮�銃桌��銃晤飯';
 $labels['info'] = '銃冢��銃韶雁鈮�銃韶��';
 $labels['foldertype'] = '銃嗣��鈮�銃賞��銃詮�� 鈮�銃韶��銃�銃�';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 4342df57f..310360144 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
+ | Author: panda                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -397,6 +396,7 @@ $labels['spellcheckignoresyms'] = 'Ignorova聽 slov獺 so symbolmi';
 $labels['spellcheckignorenums'] = 'Ignorova聽 slov獺 s ��穩slami';
 $labels['spellcheckignorecaps'] = 'Ignorova聽 slov獺 p穩san矇 ve躂k羸mi p穩smenami';
 $labels['addtodict'] = 'Prida聽 do slovn穩ka';
+$labels['mailtoprotohandler'] = 'Zaregistrova聽 handler pre odkazy ���mailto:���';
 $labels['folder'] = 'Prie��inok';
 $labels['foldername'] = 'N獺zov prie��inku';
 $labels['subscribed'] = 'Prihl獺sen羸 k odberu';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 2defb2b37..417e5c951 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
+ | Author: panda                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Nepodarilo sa spoji聽 s IMAP serverom';
 $messages['servererror'] = 'Chyba servera!';
 $messages['servererrormsg'] = 'Chyba servera: $msg';
 $messages['dberror'] = 'Datab獺zov獺 chyba!';
+$messages['requesttimedout'] = '��as po鱉iadavky vypr禳al';
 $messages['errorreadonly'] = 'Nemo鱉no vykona聽 oper獺ciu. Adres獺r je len na ��穩tanie';
 $messages['errornoperm'] = 'Nemo鱉no vykona聽 oper獺ciu. Pr穩stup odmietnut羸';
 $messages['invalidrequest'] = 'Chybn羸 po鱉iadavek. 鬚iadne 繳daje neboli ulo鱉en矇.';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 32a115a68..c1ab9712d 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -284,6 +283,7 @@ $labels['exportvcards'] = 'Izvozi stike v formatu vCard';
 $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
 $labels['grouprename'] = 'Preimenuj skupino';
 $labels['groupdelete'] = 'Izbri禳i skupino';
+$labels['groupremoveselected'] = 'Odstrani izbrane stike iz skupine';
 $labels['previouspage'] = 'Prej禳nja stran';
 $labels['firstpage'] = 'Prva stran';
 $labels['nextpage'] = 'Naslednja stran';
@@ -343,6 +343,7 @@ $labels['readwhendeleted'] = 'Ozna��i izbrisano sporo��ilo kot prebrano';
 $labels['flagfordeletion'] = 'Ne izbri禳i sporo��ila, le ozna��i kot izbrisano';
 $labels['skipdeleted'] = 'Ne prika鱉i izbrisanih sporo��il';
 $labels['deletealways'] = '��e premikanje sporo��il v Smeti spodleti, naj bodo izbrisana.';
+$labels['deletejunk'] = 'Neposredno izbri禳i sporo��ila v mapi Neza鱉elena sporo��ila';
 $labels['showremoteimages'] = 'Prika鱉i medvrsti��ne slike';
 $labels['fromknownsenders'] = 'od znanih po禳iljateljev';
 $labels['always'] = 'vedno';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 881aa74bb..a360e952f 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -1,17 +1,16 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| localization/sl_SI/messages.inc                                       |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2012, The Roundcube Dev Team                            |
-| Licensed under the GNU General Public License                         |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Jure Kranjc <Unknown>                                         |
-+-----------------------------------------------------------------------+
-@version $Id$
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
+ +-----------------------------------------------------------------------+
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'Povezava z IMAP stre鱉nikom je spodletela.';
 $messages['servererror'] = 'Napaka stre鱉nika!';
 $messages['servererrormsg'] = 'Napaka stre鱉nika $msg';
 $messages['dberror'] = 'Napaka v bazi';
+$messages['requesttimedout'] = 'Zahteva je potekla';
 $messages['errorreadonly'] = 'Operacije ni bilo mogo��e izvr禳iti. Mapa je na voljo samo za branje.';
 $messages['errornoperm'] = 'Operacije ni bilo mogo��e izvr禳iti. Dostop zavrnjen.';
 $messages['invalidrequest'] = 'Neveljavna zahteva. Podatki niso bili shranjeni.';
@@ -158,4 +158,3 @@ $messages['mispellingsfound'] = 'V sporo��ilu so bile najdene napake v ��rkovanj
 $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogo��e ustvariti/premakniti. Nimate pravic.';
 $messages['messagetoobig'] = 'Sporo��ilo je preveliko za obdelavo.';
 
-?>
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 989eea342..ceb456c14 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Maroje Delibasic <Unknown>                                    |
+ | Author: Sa禳a Zejnilovi�� <zejnils@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -136,8 +135,10 @@ $labels['deleted'] = '��訇��邽��訄郇郋';
 $labels['invert'] = '苺赲迮迡邽';
 $labels['filter'] = '苳邽郅��迮��';
 $labels['list'] = '��邽����訄';
+$labels['threads'] = '��邽��邽';
 $labels['expand-all'] = '����郋��邽��邽 ��赲迮';
 $labels['collapse-all'] = '苤訄迠邾邽 ��赲迮';
+$labels['expand_only_unread'] = '��訄邾郋 ��訄 郇迮郈��郋��邽��訄郇邽邾 郈郋����郕訄邾訄';
 $labels['fromto'] = '��迡/��訄';
 $labels['flag'] = '��訄����訄赲訄';
 $labels['attachment'] = '����邽郅郋迣';
@@ -145,6 +146,9 @@ $labels['sentdate'] = '��訄����邾 郈郋��郅訄��郋';
 $labels['arrival'] = '��訄����邾 ����邽迣郅郋';
 $labels['asc'] = '��訄��������邽';
 $labels['desc'] = '郋郈訄迡訄������邽';
+$labels['listcolumns'] = '��邽���� 郕郋郅郋郇訄';
+$labels['listsorting'] = '苤郋����邽��訄��迮 郕郋郅郋郇e';
+$labels['listmode'] = '��邽���� ��迮迠邽邾 郈��邽郕訄郱邽赲訄��訄';
 $labels['folderactions'] = '��郋����訄赲郕迮 ��訄����邽郕郅迮';
 $labels['compact'] = '��郋邾郈訄郕��邽��訄';
 $labels['empty'] = '����郈��訄郱郇邽';
@@ -155,6 +159,7 @@ $labels['quicksearch'] = '����郱訄 郈��迮����訄迣訄';
 $labels['resetsearch'] = '����邽郕訄迠邽 ��赲迮 郈郋����郕迮';
 $labels['msgtext'] = '虷迮郅訄 郈郋����郕訄';
 $labels['openinextwin'] = '����赲郋��邽 �� 郇郋赲郋邾 郈��郋郱郋����';
+$labels['emlsave'] = '��郋赲郇郅郋訄迡 (.eml)';
 $labels['editasnew'] = '��郋迡邽��邽郕���� 郕訄郋 郇郋赲郋';
 $labels['savemessage'] = '苤訄����赲訄�� �� 苤郇邽邾��迮郇迮';
 $labels['sendmessage'] = '��郋��訄��邽 郈郋����郕��';
@@ -163,6 +168,7 @@ $labels['charset'] = '苤郕��郈 郕訄��訄郕��迮��訄';
 $labels['editortype'] = '��������訄 迮迡邽��郋��訄';
 $labels['returnreceipt'] = '��郋��赲��迡訄 郋 郈��邽��郈迮����';
 $labels['dsn'] = '��訇訄赲迮����迮��迮 郋 ����訄�������� ��郅訄��訄 郈郋����郕迮';
+$labels['mailreplyintro'] = '��訄郇訄  $迡訄����邾, $郈郋��邽��訄��迮��  ��迮 郇訄郈邽��訄郋:';
 $labels['originalmessage'] = '����邽迣邽郇訄郅郇訄 郈郋����郕訄';
 $labels['editidents'] = '��郋迡邽��邽郕���� 郈��迮��迡郋郇邽邾迮';
 $labels['spellcheck'] = '����郋赲迮��訄 郈��訄赲郋郈邽��訄';
@@ -212,6 +218,7 @@ $labels['address'] = '��迡��迮��訄';
 $labels['street'] = '苺郅邽��訄';
 $labels['locality'] = '����訄迡';
 $labels['zipcode'] = '��郋����訄郇��郕邽 訇��郋��';
+$labels['region'] = '��迮郈��訇郅邽郕訄/郈��郋赲邽郇��邽��訄';
 $labels['country'] = '����迠訄赲訄';
 $labels['birthday'] = '��訄����邾 ��郋��迮��訄';
 $labels['anniversary'] = '��郋迡邽����邽��訄';
@@ -255,6 +262,7 @@ $labels['delete'] = '��訇��邽��邽';
 $labels['rename'] = '����迮邽邾迮郇����';
 $labels['addphoto'] = '��郋迡訄��';
 $labels['replacephoto'] = '��郱邾迮郇邽';
+$labels['uploadphoto'] = '��郋����訄赲邽 ��郋��郋迣��訄��邽����';
 $labels['newcontact'] = '��郋迡訄�� 郇郋赲邽 郕郋郇��訄郕��';
 $labels['deletecontact'] = '��訇��邽��邽 郋迡訄訇��訄郇迮 郕郋郇��訄郕��迮';
 $labels['composeto'] = '��訄郈邽��邽 郈郋����郕��...';
@@ -283,6 +291,7 @@ $labels['importreplace'] = '��郱邾迮郇邽 ��迮郅邽 訄迡��迮��訄��';
 $labels['importtext'] = '��郋迠迮��迮 迡訄 ��訄����赲訄��迮 郕郋郇��訄郕��迮 赲迮�� 郈郋����郋��迮��迮迣 訄迡��迮��訄��訄.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = '��郋��郋赲郋';
 $labels['settingsfor'] = '��郋迡迮��訄赲訄��訄 郱訄';
+$labels['about'] = '��郇��郋';
 $labels['preferences'] = '��郋迡迮��訄赲訄��訄';
 $labels['userpreferences'] = '��郈����訄 郈郋迡迮��訄赲訄��訄';
 $labels['editpreferences'] = '��郱邾迮郇訄 郋郈����邽�� 郈郋迡迮��訄赲訄��訄';
@@ -314,15 +323,30 @@ $labels['uisettings'] = '��郋��邽��郇邽��郕邽 邽郇��迮����迮����';
 $labels['serversettings'] = '��郋����訄赲郕迮 ��迮��赲迮��訄';
 $labels['mailboxview'] = '����迮迣郅迮迡 ��訄郇迡����迮��訄';
 $labels['askuser'] = '郈邽��訄�� 邾迮';
+$labels['ignore'] = '邽迣郇郋��邽��訄��邽';
+$labels['skipdeleted'] = '��迮 郈��邽郕訄郱���� 邽郱訇��邽��訄郇迮 郈郋����郕迮';
+$labels['deletealways'] = '��郕郋 ��郅訄��迮 郈郋����郕迮 �� 郋��郈訄迡 郇迮 ����郈迮, 郋訇��邽��邽��迮 邽��';
 $labels['always'] = '��赲迮郕';
+$labels['showinlineimages'] = '��郋郕訄迠邽 郈��邽郅郋迠迮郇迮 ��郅邽郕迮 邽��郈郋迡 郈郋����郕迮';
 $labels['autosavedraft'] = '������郋邾訄����郕邽 ����赲訄�� �� 苤郇邽邾��迮郇迮';
+$labels['keepalive'] = '����郋赲迮��邽��邽 郇郋赲迮 郈郋����郕迮 郇訄';
 $labels['never'] = '郇邽郕訄迡';
 $labels['immediately'] = '郋迡邾訄��';
 $labels['messagesdisplaying'] = '郈��邽郕訄迠邽 郈郋����郕迮';
 $labels['messagescomposition'] = '��訄����訄赲邽 郈郋����郕迮';
 $labels['mimeparamfolding'] = '邽邾迮郇訄 郈��邽郅郋迣訄';
+$labels['2231folding'] = 'Full RFC 2231 (������郇迡迮��訇邽��迡 )';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (迡����迣邽)';
+$labels['advancedoptions'] = '��訄郈��迮迡郇迮 郋郈��邽��迮';
+$labels['focusonnewmessage'] = '苳郋郕����邽��訄��邽 郈��郋郱郋�� 郈��迮����訄迠邽赲訄��訄 郇訄 郇郋赲郋�� 郈郋������邽';
+$labels['checkallfolders'] = '����郋赲迮��邽��迮 ��赲迮 ��訄����邽郕郅迮 郱訄 郇郋赲迮 郈郋����郕迮';
+$labels['displaynext'] = '��訄郕郋郇 ��郱訇��邽��訄��訄/����迮邾��迮����迮��訄 郈郋����郕迮 郈��邽郕訄郱訄��邽 ��郅迮迡迮���� 郈郋����郕��';
+$labels['defaultfont'] = '��郋迡��訄郱��邾迮赲訄郇邽 ��郋郇�� 郱訄 苭苠���� 郈郋����郕迮';
 $labels['mainoptions'] = '��郅訄赲郇迮 郈郋����訄赲郕迮';
+$labels['browseroptions'] = '��郈��邽��迮 郈��迮����訄迠邽赲訄��訄';
 $labels['section'] = '苤迮郕��邽��訄';
+$labels['maintenance'] = '��郋郈��訄赲郕迮';
 $labels['newmessage'] = '��郋赲訄 郈郋����郕訄';
 $labels['signatureoptions'] = '��郈��邽��迮 郈郋��郈邽��訄';
 $labels['whenreplying'] = '����邽 郋迡迣郋赲郋����';
@@ -341,6 +365,13 @@ $labels['afternseconds'] = '郇訄郕郋郇 $n ��迮郕��郇迡邽';
 $labels['reqmdn'] = '苺赲迮郕 郱訄����訄迠邽 郈郋赲��訄��郇�� ��郕��邽郈����';
 $labels['reqdsn'] = '苺赲迮郕 郱訄����訄迠邽 郋訇訄赲迮����迮��迮 郋 ����訄�������� ��郅訄��訄 郈郋����郕迮';
 $labels['replysamefolder'] = '苤訄����赲訄�� 郋迡迣郋赲郋��迮 �� ��訄����邽郕郅�� 郈郋����郕迮 郇訄 郕郋���� ��迮 郋迡迣郋赲訄��訄';
+$labels['defaultaddressbook'] = '��郋迡訄����迮 郇郋赲迮 郕郋郇��訄郕��迮 �� 邽郱訄訇��訄郇邽 ��迡��迮��訄��';
+$labels['listnamedisplay'] = '��邽����邽 郕郋郇��訄郕訄��迮 郕訄郋';
+$labels['spellcheckbeforesend'] = '����郋赲迮��邽��迮 郈��訄赲郋郈邽�� 郈��迮 ��郅訄��訄 郈郋����郕迮';
+$labels['spellcheckoptions'] = '��郈��邽��迮  ����郋赲迮��迮  郈��訄赲郋郈邽��訄';
+$labels['spellcheckignoresyms'] = '邽迣郇郋��邽��邽  ��迮��邽 ��訄 ��邽邾訇郋郅邽邾訄';
+$labels['spellcheckignorenums'] = '邽迣郇郋��邽��邽  ��迮��邽 ��訄 訇��郋��迮赲邽邾訄';
+$labels['addtodict'] = '��郋迡訄�� �� ��迮��郇邽郕';
 $labels['folder'] = '苳訄����邽郕郅訄';
 $labels['foldername'] = '��邾迮 ��訄����邽郕郅迮';
 $labels['subscribed'] = '��郋��郈邽��訄郇訄';
@@ -356,9 +387,19 @@ $labels['location'] = '��郋郕訄��邽��訄';
 $labels['info'] = '��郇��郋��邾訄��邽��訄';
 $labels['getfoldersize'] = '��郅邽郕郇邽��迮 郱訄 郈��邽郕訄郱 赲迮郅邽��邽郇迮 ��訄����邽郕郅迮';
 $labels['changesubscription'] = '��郅邽郕郇邽��迮 迡訄 訇邽����迮 郈��郋邾迮郇邽郅邽 郋郈邽��';
+$labels['foldertype'] = '��邽郈訄 ��訄����邽郕郅迮';
+$labels['personalfolder'] = '����邽赲訄��郇訄 ��訄����邽郕郅訄';
+$labels['otherfolder'] = '苳訄����邽郕郅訄 ������迣邽�� ��郋��邽��郇邽郕a';
+$labels['sharedfolder'] = '��訄赲郇訄 ��訄����邽郕郅訄';
 $labels['sortby'] = '苤郋����邽��訄�� 郈郋';
 $labels['sortasc'] = '苤郋����邽��訄�� ��訄��������迮';
 $labels['sortdesc'] = '苤郋����邽��訄�� 郋郈訄迡訄������迮';
+$labels['undo'] = '苺郇訄����訄迣';
+$labels['plugin'] = '��郋迡訄��邽';
+$labels['version'] = '��迮��郱邽��訄';
+$labels['source'] = '��郱赲郋��';
+$labels['license'] = '��邽��迮郇��訄';
+$labels['support'] = '郈郋迡����郕訄';
 $labels['B'] = '��';
 $labels['KB'] = '����';
 $labels['MB'] = '����';
@@ -368,6 +409,7 @@ $labels['english'] = '��郇迣郅迮��郕邽';
 $labels['westerneuropean'] = '��訄郈訄迡郇訄 ��赲��郋郈訄';
 $labels['easterneuropean'] = '������郋��郇訄 ��赲��郋郈訄';
 $labels['southeasterneuropean'] = '����迠郇郋-邽����郋��郇訄 ��赲��郋郈訄';
+$labels['baltic'] = '��訄郅��邽��郕邽';
 $labels['cyrillic'] = '��邽��邽郅邽��訄';
 $labels['arabic'] = '����訄郈��郕邽';
 $labels['greek'] = '������郕邽';
@@ -375,6 +417,7 @@ $labels['hebrew'] = '苭迮訇��迮����郕邽';
 $labels['turkish'] = '苠������郕邽';
 $labels['nordic'] = '��郋��迡邽��郕邽';
 $labels['thai'] = '苠訄��郅訄郇迡��郕邽';
+$labels['celtic'] = '郕迮郅����郕邽';
 $labels['vietnamese'] = '��邽��迮��郇訄邾��郕邽';
 $labels['japanese'] = '��訄郈訄郇��郕邽';
 $labels['korean'] = '��郋��迮訄郇��郕邽';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 8046ba0e2..863df361a 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm <Unknown>                                       |
+ | Author: Jonas Nasholm                                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -39,15 +38,12 @@ $labels['followupto'] = 'Uppf繹ljning till';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Storlek';
 $labels['priority'] = 'Prioritet';
-$labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'L瓣sstatus';
-$labels['listoptions'] = 'Listalternativ...';
 $labels['mailboxlist'] = 'Kataloger';
 $labels['folders'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['threadsfromto'] = 'Tr疇d $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
-$labels['fromtoshort'] = '$from ��� $to av $count';
 $labels['copy'] = 'Kopiera';
 $labels['move'] = 'Flytta';
 $labels['moveto'] = 'Flytta till:';
@@ -94,16 +90,12 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Idag';
-$labels['refresh'] = 'Uppdatera';
 $labels['checkmail'] = 'H瓣mta nya meddelanden';
-$labels['compose'] = 'Nytt meddelande';
 $labels['writenewmessage'] = 'Nytt meddelande';
-$labels['reply'] = 'Svara';
 $labels['replytomessage'] = 'Svara avs瓣ndaren';
 $labels['replytoallmessage'] = 'Svara avs瓣ndaren och alla mottagare';
 $labels['replyall'] = 'Svara alla';
 $labels['replylist'] = 'Svara lista';
-$labels['forward'] = 'Vidarebefordra';
 $labels['forwardinline'] = 'Vidarebefordra infogat';
 $labels['forwardattachment'] = 'Vidarebefordra som bilaga';
 $labels['forwardmessage'] = 'Vidarebefordra meddelande';
@@ -116,16 +108,12 @@ $labels['nextmessage'] = 'Visa n瓣sta meddelande';
 $labels['lastmessage'] = 'Visa sista meddelandet';
 $labels['backtolist'] = 'Tillbaka till meddelandelistan';
 $labels['viewsource'] = 'Visa k瓣llkod';
-$labels['mark'] = 'M瓣rk';
 $labels['markmessages'] = 'M瓣rk meddelande';
 $labels['markread'] = 'L瓣st';
 $labels['markunread'] = 'Ol瓣st';
 $labels['markflagged'] = 'Flaggat';
 $labels['markunflagged'] = 'Oflaggat';
 $labels['moreactions'] = 'Ytterligare hantering...';
-$labels['more'] = 'Fler';
-$labels['back'] = 'Tillbaka';
-$labels['options'] = 'Alternativ';
 $labels['select'] = 'V瓣lj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
@@ -170,8 +158,6 @@ $labels['msgtext'] = 'Hela meddelandet';
 $labels['openinextwin'] = '��ppna i nytt f繹nster';
 $labels['emlsave'] = 'Spara (.eml)';
 $labels['editasnew'] = 'Redigera som nytt';
-$labels['savemessage'] = 'Spara utkast';
-$labels['sendmessage'] = 'Skicka meddelande';
 $labels['addattachment'] = 'Bifoga fil';
 $labels['charset'] = 'Teckenkodning';
 $labels['editortype'] = 'Textredigerare';
@@ -180,11 +166,9 @@ $labels['dsn'] = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
 $labels['editidents'] = '��ndra identiteter';
-$labels['spellcheck'] = 'R瓣ttstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = '��teruppta redigering';
 $labels['revertto'] = '��terg疇 till';
-$labels['attach'] = 'Bifoga';
 $labels['attachments'] = 'Bilagor';
 $labels['upload'] = 'Bifoga';
 $labels['uploadprogress'] = '$percent ($current av $total)';
@@ -208,10 +192,8 @@ $labels['addcc'] = 'Kopia';
 $labels['addbcc'] = 'Dold kopia';
 $labels['addreplyto'] = 'Svar till';
 $labels['addfollowupto'] = 'Uppf繹ljning till';
-$labels['mdnrequest'] = 'Avs瓣ndaren har beg瓣rt mottagarkvitto f繹r det h瓣r meddelandet. Vill du skicka ett mottagarkvitto?';
 $labels['receiptread'] = 'Mottagarkvitto (l瓣st)';
 $labels['yourmessage'] = 'Det h瓣r 瓣r ett mottagarkvitto f繹r ditt meddelande';
-$labels['receiptnote'] = 'Notera: Mottagarkvittot inneb瓣r bara att meddelandet visats p疇 mottagarens dator. D瓣rmed finns ingen garanti att mottagaren har l瓣st och f繹rst疇tt meddelandet.';
 $labels['name'] = 'Namn';
 $labels['firstname'] = 'F繹rnamn';
 $labels['surname'] = 'Efternamn';
@@ -244,8 +226,7 @@ $labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla f瓣lt';
 $labels['search'] = 'S繹k';
-$labels['advsearch'] = 'Avancerad s繹kning';
-$labels['advanced'] = 'Avancerad';
+$labels['advsearch'] = 'S繹k avancerat';
 $labels['other'] = 'Annat';
 $labels['typeother'] = 'Annat';
 $labels['typehome'] = 'Hem';
@@ -273,7 +254,6 @@ $labels['delete'] = 'Ta bort';
 $labels['rename'] = '��ndra namn';
 $labels['addphoto'] = 'L瓣gg till';
 $labels['replacephoto'] = 'Ers瓣tt';
-$labels['uploadphoto'] = 'Ladda upp foto';
 $labels['newcontact'] = 'Ny kontakt';
 $labels['deletecontact'] = 'Ta bort vald kontakt';
 $labels['composeto'] = 'Nytt meddelande till vald kontakt';
@@ -284,7 +264,6 @@ $labels['exportvcards'] = 'Exportera kontakter';
 $labels['newcontactgroup'] = 'Ny kontaktgrupp';
 $labels['grouprename'] = '��ndra gruppnamn';
 $labels['groupdelete'] = 'Ta bort grupp';
-$labels['groupremoveselected'] = 'Ta bort markerade kontakter fr疇n gruppen';
 $labels['previouspage'] = 'Visa f繹reg疇ende sida';
 $labels['firstpage'] = 'Visa f繹rsta sidan';
 $labels['nextpage'] = 'Visa n瓣sta sida';
@@ -299,7 +278,6 @@ $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera fr疇n fil:';
 $labels['importtarget'] = 'L瓣gg till nya kontakter till adressbok:';
 $labels['importreplace'] = 'Ers瓣tt samtliga kontakter i adressboken';
-$labels['importtext'] = 'Kontakter kan importeras fr疇n en befintlig adressbok.<br/>F繹r n瓣rvarande st繹ds import av adresser i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-format.';
 $labels['done'] = 'Klart';
 $labels['settingsfor'] = 'Inst瓣llningar f繹r';
 $labels['about'] = 'Om';
@@ -344,7 +322,6 @@ $labels['readwhendeleted'] = 'M瓣rk meddelande som l瓣st vid borttagning';
 $labels['flagfordeletion'] = 'Flagga meddelande f繹r borttagning ist瓣llet f繹r att ta bort direkt';
 $labels['skipdeleted'] = 'Visa inte borttagna meddelanden';
 $labels['deletealways'] = 'Ta bort meddelande om flyttning till Papperskorg misslyckas';
-$labels['deletejunk'] = 'Radera automatiskt meddelanden i skr瓣pmappen';
 $labels['showremoteimages'] = 'Visa externt l瓣nkade bilder i meddelande';
 $labels['fromknownsenders'] = 'Fr疇n k瓣nda avs瓣ndare';
 $labels['always'] = 'Alltid';
@@ -367,12 +344,11 @@ $labels['checkallfolders'] = 'Genoms繹k samtliga kataloger efter nya meddelanden
 $labels['displaynext'] = 'Visa n瓣sta meddelande efter borttagning/flyttning av meddelande';
 $labels['defaultfont'] = 'Standardtypsnitt i HTML-meddelande';
 $labels['mainoptions'] = 'Huvudalternativ';
-$labels['browseroptions'] = 'Webbl瓣saralternativ';
 $labels['section'] = 'Avdelning';
 $labels['maintenance'] = 'Underh疇ll';
 $labels['newmessage'] = 'Nytt meddelande';
 $labels['signatureoptions'] = 'Signaturalternativ';
-$labels['whenreplying'] = 'Vid svar forts瓣tt skriv';
+$labels['whenreplying'] = 'Vid svar';
 $labels['replytopposting'] = 'Ovanf繹r befintligt meddelande';
 $labels['replybottomposting'] = 'Nedanf繹r befintligt meddelande';
 $labels['replyremovesignature'] = 'Ta bort befintlig signatur fr疇n meddelandet vid svar';
@@ -390,14 +366,12 @@ $labels['reqdsn'] = 'Beg瓣r alltid leveransstatusmeddelande';
 $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
 $labels['defaultaddressbook'] = 'L瓣gg till nya kontakter i vald adressbok';
 $labels['autocompletesingle'] = 'Hoppa 繹ver alternativa adresser vid automatisk komplettering';
-$labels['listnamedisplay'] = 'Lista kontakter som';
 $labels['spellcheckbeforesend'] = 'Kontrollera stavning innan meddelanden skickas';
 $labels['spellcheckoptions'] = 'R瓣ttstavningsalternativ';
 $labels['spellcheckignoresyms'] = 'Ignorera ord med symboler';
 $labels['spellcheckignorenums'] = 'Ignorera ord med siffror';
 $labels['spellcheckignorecaps'] = 'Ignorera ord med enbart stora bokst瓣ver';
 $labels['addtodict'] = 'L瓣gg till i ordlista';
-$labels['mailtoprotohandler'] = 'Ange program f繹r hantering av mailto-l瓣nkar';
 $labels['folder'] = 'Katalog';
 $labels['foldername'] = 'Katalognamn';
 $labels['subscribed'] = 'Prenumererad';
@@ -411,7 +385,7 @@ $labels['folderproperties'] = 'Katalogegenskaper';
 $labels['parentfolder'] = '��verliggande katalog';
 $labels['location'] = 'Plats';
 $labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Ber瓣kna katalogstorlek';
+$labels['getfoldersize'] = 'Klicka f繹r katalogstorlek';
 $labels['changesubscription'] = 'Klicka f繹r att 瓣ndra prenumeration';
 $labels['foldertype'] = 'Katalogtyp';
 $labels['personalfolder'] = 'Privat katalog';
@@ -425,7 +399,7 @@ $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'K瓣llkod';
 $labels['license'] = 'Licens';
-$labels['support'] = 'Hj瓣lp';
+$labels['support'] = 'F疇 hj瓣lp';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 0a5adfad4..db1acfdc1 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -9,17 +9,14 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm <Unknown>                                       |
+ | Author: Jonas Nasholm                                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ett fel uppstod!';
 $messages['loginfailed'] = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbl瓣sare accepterar inte cookies';
 $messages['sessionerror'] = 'Din inloggning 瓣r felaktig eller har g疇tt ut';
-$messages['storageerror'] = 'Anslutning till IMAP-servern misslyckades';
 $messages['servererror'] = 'Serverfel!';
 $messages['servererrormsg'] = 'Serverfel: $msg';
 $messages['dberror'] = 'Databasfel!';
@@ -77,7 +74,6 @@ $messages['nobodywarning'] = 'Skicka det h瓣r meddelandet utan text?';
 $messages['notsentwarning'] = 'Meddelandet har inte skickats. Vill du avbryta meddelandet?';
 $messages['noldapserver'] = 'Ange en LDAP-server f繹r att s繹ka';
 $messages['nosearchname'] = 'Ange ett kontaktnamn eller en adress';
-$messages['notuploadedwarning'] = 'Alla bilagor har inte 繹verf繹rts 瓣nnu. V瓣nligen v瓣nta eller avbryt 繹verf繹ringen.';
 $messages['searchsuccessful'] = '$nr meddelanden hittades';
 $messages['contactsearchsuccessful'] = '$nr kontakter hittades';
 $messages['searchnomatch'] = 'S繹kningen gav inget resultat';
@@ -107,7 +103,6 @@ $messages['addingmember'] = 'L瓣gger till kontakter i gruppen...';
 $messages['removingmember'] = 'Tar bort kontakter fr疇n gruppen...';
 $messages['receiptsent'] = 'Mottagarkvitto har skickats';
 $messages['errorsendingreceipt'] = 'Mottagarkvitto kunde inte skickas';
-$messages['deleteidentityconfirm'] = 'Vill du verkligen ta bort denna identitet?';
 $messages['nodeletelastidentity'] = 'Du kan inte ta bort identiteten, den 瓣r din sista.';
 $messages['forbiddencharacter'] = 'Katalognamnet inneh疇ller otill疇tna tecken';
 $messages['selectimportfile'] = 'V瓣lj en fil att ladda upp';
@@ -116,12 +111,10 @@ $messages['contactaddedtogroup'] = 'Kontakterna har lagts till i gruppen';
 $messages['contactremovedfromgroup'] = 'Kontakterna har tagits bort fr疇n gruppen';
 $messages['importwait'] = 'Importerar, var god v瓣nta...';
 $messages['importerror'] = 'Importen misslyckades! Filen 瓣r inte i vCard-format.';
-$messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter, $skipped dubbletter har ignorerats:</b><p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter, $skipped dubbletter harignorerats:</b><p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Hoppade 繹ver $skipped befintliga poster</b>';
 $messages['opnotpermitted'] = 'Otill疇ten operation!';
 $messages['nofromaddress'] = 'Adress saknas i den valda identiteten';
-$messages['editorwarning'] = 'Genom att v瓣xla till text-l瓣ge g疇r formateringen f繹rlorad. Vill du forts瓣tta?';
-$messages['httpreceivedencrypterror'] = 'Ett irreparabelt fel har uppst疇tt. Kontakta administrat繹ren omg疇ende. <b>Meddelandet kan inte skickas.</b>';
 $messages['smtpconnerror'] = 'SMTP-fel ($code): Anslutning till servern misslyckades';
 $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades';
 $messages['smtpfromerror'] = 'SMTP-fel ($code): Kan inte s瓣tta avs瓣ndaradress till "$from';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 00bcca8f0..61369fb75 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bedo <bedreddinsahbaz@gmail.com>                              |
+ | Author: ismail yenigul                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -40,17 +39,17 @@ $labels['date'] = 'Tarih';
 $labels['size'] = 'Boyut';
 $labels['priority'] = '��ncelik';
 $labels['organization'] = 'Kurulu��';
-$labels['readstatus'] = 'Okundu durumu';
+$labels['readstatus'] = 'Okunma durumu';
 $labels['listoptions'] = 'Se癟enekleri listele...';
 $labels['mailboxlist'] = 'Klas繹rler';
 $labels['folders'] = 'Klas繹rler';
 $labels['messagesfromto'] = 'Postalar: $from - $to , Toplam: $count';
-$labels['threadsfromto'] = 'Dizilmler: $from - $to, Toplam $count';
+$labels['threadsfromto'] = 'Postalar: $from - $to, Toplam $count';
 $labels['messagenrof'] = 'Posta: $nr / $count';
 $labels['fromtoshort'] = '$from - $to , Toplam: $count';
 $labels['copy'] = 'Kopyala';
 $labels['move'] = 'Ta��覺';
-$labels['moveto'] = 'Buraya ta��覺...';
+$labels['moveto'] = '��uraya ta��覺...';
 $labels['download'] = '襤ndir';
 $labels['filename'] = 'Dosya Ad覺';
 $labels['filesize'] = 'Dosya Boyutu';
@@ -58,11 +57,11 @@ $labels['addtoaddressbook'] = 'Adres Defterine Ekle';
 $labels['sun'] = 'Paz';
 $labels['mon'] = 'Pzt';
 $labels['tue'] = 'Sal';
-$labels['wed'] = '��ar';
+$labels['wed'] = '��r��';
 $labels['thu'] = 'Per';
 $labels['fri'] = 'Cum';
-$labels['sat'] = 'Cmt';
-$labels['sunday'] = 'Pazar';
+$labels['sat'] = 'Cts';
+$labels['sunday'] = 'Paz';
 $labels['monday'] = 'Pazartesi';
 $labels['tuesday'] = 'Sal覺';
 $labels['wednesday'] = '��ar��amba';
@@ -95,34 +94,34 @@ $labels['longnov'] = 'Kas覺m';
 $labels['longdec'] = 'Aral覺k';
 $labels['today'] = 'Bug羹n';
 $labels['refresh'] = 'Yenile';
-$labels['checkmail'] = 'Yeni postalar覺 kontrol et';
-$labels['compose'] = 'Yeni posta olu��tur';
+$labels['checkmail'] = 'Yeni Postalar覺 Kontrol Et';
+$labels['compose'] = 'E-Posta Yaz';
 $labels['writenewmessage'] = 'Yeni posta olu��tur';
 $labels['reply'] = 'Yan覺tla';
-$labels['replytomessage'] = 'G繹nderene yan覺tla';
-$labels['replytoallmessage'] = 'G繹nderene ve t羹m al覺c覺lara yan覺tla';
-$labels['replyall'] = 'T羹m羹ne yan覺tla';
-$labels['replylist'] = 'Listeye yan覺tla';
+$labels['replytomessage'] = 'G繹nderene Yan覺t Ver';
+$labels['replytoallmessage'] = 'G繹nderene ve T羹m Al覺c覺lara Yan覺t Ver';
+$labels['replyall'] = 'T羹m羹ne Yan覺t Ver';
+$labels['replylist'] = 'Listeye Yan覺t Ver';
 $labels['forward'] = '襤let';
 $labels['forwardinline'] = 'Postan覺n i癟inde ilet';
-$labels['forwardattachment'] = 'Eklenti olarak ilet';
-$labels['forwardmessage'] = 'Postay覺 ilet';
-$labels['deletemessage'] = 'Postay覺 sil';
-$labels['movemessagetotrash'] = 'Postay覺 癟繹pe ta��覺';
-$labels['printmessage'] = 'Bu postay覺 yazd覺r';
-$labels['previousmessage'] = '��nceki postay覺 g繹ster';
-$labels['firstmessage'] = '襤lk postay覺 g繹ster';
-$labels['nextmessage'] = 'Sonraki postay覺 g繹ster';
-$labels['lastmessage'] = 'Son postay覺 g繹ster';
-$labels['backtolist'] = 'Posta listesine d繹n';
-$labels['viewsource'] = 'Kayna��覺 g繹ster';
+$labels['forwardattachment'] = 'Eklenti Olarak 襤let';
+$labels['forwardmessage'] = 'Postay覺 襤let';
+$labels['deletemessage'] = 'Postay覺 Sil';
+$labels['movemessagetotrash'] = 'Postay覺 ��繹pe Ta��覺';
+$labels['printmessage'] = 'Bu Postay覺 Yazd覺r';
+$labels['previousmessage'] = '��nceki Postay覺 G繹ster';
+$labels['firstmessage'] = '襤lk Postay覺 G繹ster';
+$labels['nextmessage'] = 'Sonraki Postay覺 G繹ster';
+$labels['lastmessage'] = 'Son Postay覺 G繹ster';
+$labels['backtolist'] = 'Posta Listesine D繹n';
+$labels['viewsource'] = 'Kayna��覺 G繹ster';
 $labels['mark'] = '襤��aretle';
-$labels['markmessages'] = 'Postalar覺 i��aretle';
-$labels['markread'] = 'okunmu�� olarak';
-$labels['markunread'] = 'okunmam覺�� olarak';
-$labels['markflagged'] = 'i��aretli olarak';
-$labels['markunflagged'] = 'i��aretsiz olarak';
-$labels['moreactions'] = 'Daha fazla eylem...';
+$labels['markmessages'] = 'Postalar覺 襤��aretle';
+$labels['markread'] = 'Okunmu�� Olarak';
+$labels['markunread'] = 'Okunmam覺�� Olarak';
+$labels['markflagged'] = '襤��aretli Olarak';
+$labels['markunflagged'] = '襤��aretsiz Olarak';
+$labels['moreactions'] = 'Di��er 襤��lemler';
 $labels['more'] = 'Daha Fazla';
 $labels['back'] = 'Geri';
 $labels['options'] = 'Se癟enekler';
@@ -284,6 +283,7 @@ $labels['exportvcards'] = 'vCard olarak d覺��a aktar';
 $labels['newcontactgroup'] = 'Yeni ki��i grubu olu��tur';
 $labels['grouprename'] = 'Grubu yeniden adland覺r';
 $labels['groupdelete'] = 'Grubu sil';
+$labels['groupremoveselected'] = 'Se癟ili kontaktlar覺 gruptan sil';
 $labels['previouspage'] = '��ncekileri g繹ster';
 $labels['firstpage'] = '襤lkini g繹ster';
 $labels['nextpage'] = 'Sonrakileri g繹ster';
@@ -343,6 +343,7 @@ $labels['readwhendeleted'] = 'Silinen postalar覺 okunmu�� olarak i��aretle';
 $labels['flagfordeletion'] = 'Postalar覺 silmek yerine silinecek olarak i��aretle';
 $labels['skipdeleted'] = 'Silinmi�� postalar覺 g繹sterme';
 $labels['deletealways'] = 'Postalar覺n 癟繹pe ta��覺nmas覺nda sorun 癟覺karsa, postalar覺 sil';
+$labels['deletejunk'] = '襤stenmeyenler klas繹r羹ndeki mesajlar覺 do��rudan sil';
 $labels['showremoteimages'] = 'Uzaktan y羹klenen resimleri g繹ster';
 $labels['fromknownsenders'] = 'bilinen g繹ndericilerden';
 $labels['always'] = 'her zaman';
@@ -390,23 +391,23 @@ $labels['defaultaddressbook'] = 'Yeni ki��ileri se癟ili adres defterine ekle';
 $labels['autocompletesingle'] = 'Otomatik tamamlamalarda alternatif e-posta adreslerini atla';
 $labels['listnamedisplay'] = 'Ki��iyi g繹r羹nt羹le';
 $labels['spellcheckbeforesend'] = 'Posta g繹ndermeden 繹nce yaz覺m denetimi yap';
-$labels['spellcheckoptions'] = 'Yaz覺m denetimi se癟enekleri';
-$labels['spellcheckignoresyms'] = '襤癟inde sembol ge癟en kelimleri g繹z ard覺 et';
+$labels['spellcheckoptions'] = 'Yaz覺m Denetimi Se癟enekleri';
+$labels['spellcheckignoresyms'] = '襤癟inde semboller ge癟en kelimeleri g繹zard覺 et';
 $labels['spellcheckignorenums'] = '襤癟inde rakam ge癟en kelimleri g繹z ard覺 et';
 $labels['spellcheckignorecaps'] = 'T羹m羹 b羹y羹k harf olan kelimleri g繹z ard覺 et';
-$labels['addtodict'] = 'S繹zl羹��e ekle';
+$labels['addtodict'] = 'S繹zl羹��e Ekle';
 $labels['mailtoprotohandler'] = 'mailto: ba��lant覺lar覺 i癟in protokol i��leyici kay覺t et';
 $labels['folder'] = 'Klas繹r';
-$labels['foldername'] = 'Klas繹r ismi';
+$labels['foldername'] = 'Klas繹r Ad覺';
 $labels['subscribed'] = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
 $labels['create'] = 'Olu��tur';
-$labels['createfolder'] = 'Yeni klas繹r olu��tur';
-$labels['managefolders'] = 'Klas繹rleri d羹zenle';
-$labels['specialfolders'] = '��zel klas繹rler';
+$labels['createfolder'] = 'Yeni Klas繹r Olu��tur';
+$labels['managefolders'] = 'Klas繹rleri D羹zenle';
+$labels['specialfolders'] = '��zel Klas繹rler';
 $labels['properties'] = '��zellikler';
-$labels['folderproperties'] = 'Klas繹r 繹zellikleri';
-$labels['parentfolder'] = '��st klas繹r';
+$labels['folderproperties'] = 'Klas繹r ��zellikleri';
+$labels['parentfolder'] = 'Ana Dizin';
 $labels['location'] = 'Konum';
 $labels['info'] = 'Bilgi';
 $labels['getfoldersize'] = 'Klas繹r b羹y羹kl羹��羹n羹 繹��renmek i癟in t覺klay覺n';
@@ -423,7 +424,7 @@ $labels['plugin'] = 'Eklenti';
 $labels['version'] = 'S羹r羹m';
 $labels['source'] = 'Kaynak';
 $labels['license'] = 'Lisans';
-$labels['support'] = 'Destek al';
+$labels['support'] = 'Destek Al';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index cb37a5dcb..23ba0480f 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: ismail yenigul                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = 'IMAP sunucusuna ba��lan覺lamad覺';
 $messages['servererror'] = 'Sunucu Hatas覺!';
 $messages['servererrormsg'] = 'Sunucu hatas覺: $msg';
 $messages['dberror'] = 'Veritaban覺 Hatas覺!';
+$messages['requesttimedout'] = '襤stek zaman a��覺m覺na u��rad覺';
 $messages['errorreadonly'] = '襤��lem ger癟ekle��tirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = '襤��lem ger癟ekle��tirilemedi. 襤zin verilmedi.';
 $messages['invalidrequest'] = 'Ge癟ersiz 襤stek! Veri kaydedilmedi';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 726cd5adc..a8da7b041 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Nguyen Tuan Anh <mrtuananh@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -45,7 +44,9 @@ $labels['listoptions'] = 'L廙帶 ch廙�n danh s獺ch';
 $labels['mailboxlist'] = 'Thが m廙卉';
 $labels['folders'] = 'Thが m廙卉';
 $labels['messagesfromto'] = 'Thが $from - $to / $count';
+$labels['threadsfromto'] = 'Email t廙� $from ��廕積 $to c廙吧 t廙�ng $count';
 $labels['messagenrof'] = 'Thが $nr / $count';
+$labels['fromtoshort'] = '$from - $to c廙吧 $count';
 $labels['copy'] = 'Sao ch矇p';
 $labels['move'] = 'Chuy廙�n';
 $labels['moveto'] = 'Chuy廙�n t廙�i';
@@ -102,6 +103,8 @@ $labels['replytoallmessage'] = 'Tr廕� l廙�i theo danh s獺ch ho廕搾 t廙�i ngが廙�
 $labels['replyall'] = 'Tr廕� l廙�i t廕另 c廕�';
 $labels['replylist'] = 'Danh s獺ch tr廕� l廙�i';
 $labels['forward'] = 'Chuy廙�n ti廕穆';
+$labels['forwardinline'] = 'Chuy廙�n ti廕穆 thが';
+$labels['forwardattachment'] = 'Chuy廙�n ti廕穆 nhが ��穩nh k癡m';
 $labels['forwardmessage'] = 'Chuy廙�n ti廕穆 thが';
 $labels['deletemessage'] = 'X籀a thが';
 $labels['movemessagetotrash'] = 'Chuy廙�n thが v��o th羅ng r獺c';
@@ -131,14 +134,20 @@ $labels['unread'] = 'Chがa ��廙�c';
 $labels['flagged'] = '��瓊 ��獺nh d廕只';
 $labels['unanswered'] = 'Chがa ��が廙θ tr廕� l廙�i';
 $labels['deleted'] = '��瓊 ��が廙θ x籀a';
+$labels['invert'] = '��廕υ ngが廙θ';
 $labels['filter'] = 'L廙�c';
 $labels['list'] = 'Danh s獺ch';
 $labels['threads'] = 'M廙�i nguy hi廙�m';
 $labels['expand-all'] = 'M廙� r廙�ng t廕另 c廕�';
 $labels['expand-unread'] = 'M廙� r廙�ng thが chがa ��廙�c';
+$labels['collapse-all'] = '��籀ng h廕篙';
+$labels['threaded'] = '��瓊 ��が廙θ ph璽n lo廕【';
+$labels['autoexpand_threads'] = 'M廙� r廙�ng c獺c thが';
+$labels['do_expand'] = 'T廕另 c廕� c獺c thが';
 $labels['expand_only_unread'] = 'Ch廙� v廙�i nh廙疸g thが chがa ��廙�c';
 $labels['fromto'] = 'T廙�/��廕積';
 $labels['flag'] = '��獺nh d廕只';
+$labels['attachment'] = '��穩nh k癡m';
 $labels['sentdate'] = 'Ng��y g廙虹';
 $labels['arrival'] = 'Ng��y ��廕積';
 $labels['asc'] = 'T��ng d廕吵';
@@ -155,22 +164,29 @@ $labels['unknown'] = 'Kh繫ng r繭';
 $labels['unlimited'] = 'Kh繫ng h廕》 ch廕�';
 $labels['quicksearch'] = 'T穫m nhanh';
 $labels['resetsearch'] = 'Thi廕篙 l廕計 l廕【 t穫m ki廕禦';
+$labels['searchmod'] = 'T��m ngが廙�i s廙苔';
 $labels['msgtext'] = 'To��n b廙� thが';
 $labels['openinextwin'] = 'M廙� b廕彫g c廙苔 s廙� m廙�i';
+$labels['emlsave'] = 'T廕ξ v廙�';
 $labels['editasnew'] = 'S廙苔 th��nh m廙�i';
 $labels['savemessage'] = 'Lがu d廕》g nh獺p';
 $labels['sendmessage'] = 'G廙虹 thが';
 $labels['addattachment'] = '��穩nh k癡m t廕計 tin';
 $labels['charset'] = 'B廙� k羸 t廙�';
+$labels['editortype'] = 'Lo廕【 so廕》 th廕υ';
 $labels['returnreceipt'] = 'B獺o nh廕要';
 $labels['dsn'] = 'Th繫ng b獺o t穫nh tr廕》g ph璽n ph獺t thが';
+$labels['mailreplyintro'] = 'V��o ng��y $date, $sender vi廕篙:';
+$labels['originalmessage'] = 'Thが g廙�c';
 $labels['editidents'] = 'Ch廙�nh s廙苔 nh廕要 d廕》g';
 $labels['spellcheck'] = '��獺nh v廕吵';
 $labels['checkspelling'] = 'Ki廙�m tra ch穩nh t廕�';
 $labels['resumeediting'] = 'So廕》 th廕υ';
 $labels['revertto'] = 'Chuy廙�n v廙�';
+$labels['attach'] = '��穩nh k癡m';
 $labels['attachments'] = 'G廙虹 k癡m';
 $labels['upload'] = 'T廕ξ l礙n';
+$labels['uploadprogress'] = '$percent ($current t廙� $total)';
 $labels['close'] = '��籀ng';
 $labels['messageoptions'] = 'T羅y ch廙�n cho thが...';
 $labels['low'] = 'Th廕叼';
@@ -190,7 +206,10 @@ $labels['maxuploadsize'] = 'Dung lが廙τg file t廙�i ��a cho ph矇p l��';
 $labels['addcc'] = 'Th礙m Cc';
 $labels['addbcc'] = 'Th礙m Bcc';
 $labels['addreplyto'] = 'Th礙m tr廕� l廙�i t廙�i';
+$labels['addfollowupto'] = 'Th礙m Followup-To';
 $labels['mdnrequest'] = 'Ngが廙�i g廙虹 thが n��y y礙u c廕吟 ��が廙θ th繫ng b獺o khi b廕》 ��瓊 ��廙�c thが n��y. B廕》 c籀 mu廙�n th繫ng b獺o cho ngが廙�i g廙虹 kh繫ng?';
+$labels['receiptread'] = 'Tr廕� l廕【 x獺c nh廕要 (��瓊 ��廙�c)';
+$labels['yourmessage'] = '��璽y l�� s廙� tr廕� l廕【 x獺c nh廕要 cho thが c廙吧 b廕》';
 $labels['receiptnote'] = 'Lがu 羸: Vi廙�c nh廕要 n��y ch廙� b獺o r廕彫g thが ��瓊 ��が廙θ hi廙�n th廙� tr礙n m獺y t穩nh c廙吧 ngが廙�i nh廕要. Kh繫ng c籀 ��廕σ b廕υ n��o r廕彫g ngが廙�i nh廕要 ��籀 ��瓊 ��廙�c ho廕搾 hi廙�u n廙�i dung thが.';
 $labels['name'] = 'Hi廙�n t礙n';
 $labels['firstname'] = 'T礙n';
@@ -202,6 +221,7 @@ $labels['nickname'] = 'Bi廙�t danh';
 $labels['jobtitle'] = 'Ch廙妾 danh C繫ng vi廙�c';
 $labels['department'] = 'Ph簷ng/Ban';
 $labels['gender'] = 'Gi廙�i t穩nh';
+$labels['maidenname'] = 'T礙n th廙�i con g獺i';
 $labels['email'] = 'Thが ��i廙�n t廙�';
 $labels['phone'] = '��i廙�n tho廕【';
 $labels['address'] = '��廙�a ch廙�';
@@ -213,26 +233,37 @@ $labels['country'] = 'Qu廙�c gia';
 $labels['birthday'] = 'Ng��y sinh';
 $labels['anniversary'] = 'K廙� ni廙�m';
 $labels['website'] = 'Trang Web';
+$labels['instantmessenger'] = 'Tin nh廕疸';
 $labels['notes'] = 'C獺c ghi ch繳';
 $labels['male'] = 'Nam';
 $labels['female'] = 'N廙�';
 $labels['manager'] = 'Ngが廙�i qu廕τ l羸';
 $labels['assistant'] = 'Tr廙� l羸';
 $labels['typeassistant'] = 'Tr廙� l羸';
+$labels['spouse'] = 'V廙�/Ch廙�ng';
+$labels['allfields'] = 'T廕另 c廕� c獺c l藺nh v廙帷';
 $labels['search'] = 'T穫m ki廕禦';
 $labels['advsearch'] = 'T穫m ki廕禦 n璽ng cao';
+$labels['advanced'] = 'N璽ng cao';
 $labels['other'] = 'Lo廕【 kh獺c';
 $labels['typeother'] = 'Lo廕【 kh獺c';
+$labels['typehome'] = 'Thが m廙卉 ch穩nh';
 $labels['typework'] = 'C繫ng vi廙�c';
 $labels['typemobile'] = 'S廙� di ��廙�ng';
+$labels['typemain'] = 'Ch穩nh';
 $labels['typehomefax'] = 'Fax nh�� ri礙ng';
 $labels['typeworkfax'] = 'Fax cヾ quan';
 $labels['typecar'] = 'Xe 繫 t繫';
+$labels['typepager'] = 'M獺y nh廕疸 tin';
+$labels['typevideo'] = 'Video';
 $labels['typehomepage'] = 'Trang ch廙�';
+$labels['typeblog'] = 'Nh廕負 k羸 M廕》g';
 $labels['typeprofile'] = 'H廙� sヾ';
+$labels['addfield'] = 'Th礙m l藺nh v廙帷...';
 $labels['addcontact'] = 'Th礙m m廙�t li礙n h廙� m廙�i';
 $labels['editcontact'] = 'S廙苔 li礙n l廕︷';
 $labels['contacts'] = 'Danh b廕�';
+$labels['contactproperties'] = 'T穩nh ch廕另 c廙吧 li礙n h廙�';
 $labels['personalinfo'] = 'Th繫ng tin c獺 nh璽n';
 $labels['edit'] = 'S廙苔 ��廙�i';
 $labels['cancel'] = 'Hu廙� b廙�';
@@ -248,6 +279,7 @@ $labels['composeto'] = 'So廕》 thが cho';
 $labels['contactsfromto'] = '��廙�a ch廙� t廙� $from - $to / $count';
 $labels['print'] = 'In thが';
 $labels['export'] = 'Xu廕另 ra';
+$labels['exportvcards'] = 'Xu廕另 c獺c li礙n l廕︷ theo ��廙�nh d廕》g vCard';
 $labels['newcontactgroup'] = 'T廕︽ nh籀m li礙n l廕︷ m廙�i';
 $labels['grouprename'] = '��廙�i t礙n nh籀m';
 $labels['groupdelete'] = 'X籀a nh籀m';
@@ -263,12 +295,14 @@ $labels['searchsave'] = 'Lがu t穫m ki廕禦';
 $labels['searchdelete'] = 'X籀a t穫m ki廕禦';
 $labels['import'] = 'Nh廕計';
 $labels['importcontacts'] = 'Nh廕計 li礙n l廕︷';
+$labels['importfromfile'] = 'Nh廕計 t廙� t廙�p:';
 $labels['importtarget'] = 'Th礙m li礙n l廕︷ m廙�i v��o s廙� ��廙�a ch廙�';
 $labels['importreplace'] = 'Thay th廕� to��n b廙� s廙� ��廙�a ch廙�';
 $labels['importtext'] = 'B廕》 c籀 th廙� t廕ξ li礙n l廕︷ l礙n t廙� s廙� ��廙�a ch廙� s廕登 c籀.<br/> Ch繳ng t繫i h廙� tr廙� nh廕計 ��廙�a ch廙� t廙� <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = '��瓊 xong';
 $labels['settingsfor'] = 'Thi廕篙 l廕計 cho';
 $labels['about'] = 'Gi廙�i thi廙�u';
+$labels['preferences'] = 'S廙� th穩ch';
 $labels['userpreferences'] = 'Tham s廙� ngが廙�i d羅ng';
 $labels['editpreferences'] = 'S廙苔 ��廙�i';
 $labels['identities'] = 'Ngが廙�i d羅ng';
@@ -277,6 +311,7 @@ $labels['newidentity'] = 'Ngが廙�i d羅ng m廙�i';
 $labels['newitem'] = 'M廙卉 m廙�i';
 $labels['edititem'] = 'S廙苔 ��廙�i m廙卉';
 $labels['preferhtml'] = 'Hi廙�n th廙� HTML';
+$labels['defaultcharset'] = 'B廙� k羸 t廙� m廕搾 ��廙�nh';
 $labels['htmlmessage'] = 'Thが ki廙�u HTML';
 $labels['dateformat'] = '��廙�nh d廕》g ng��y';
 $labels['timeformat'] = '��廙�nh d廕》g th廙�i gian';
@@ -289,15 +324,79 @@ $labels['pagesize'] = 'S廙� d簷ng tr礙n trang';
 $labels['signature'] = 'Ch廙� k羸';
 $labels['dstactive'] = 'Gi廙� m羅a h癡';
 $labels['htmleditor'] = 'So廕》 thが d廕》g HTML';
+$labels['htmlonreply'] = 'Ch廙� tr廕� l廙�i l廕【 b廕彫g thが HTML';
+$labels['htmlsignature'] = 'Ch廙� k羸 HTML';
+$labels['previewpane'] = 'Hi廙�n 繫 Xem th廙�';
+$labels['skin'] = 'B廙� m廕暗 giao di廙�n';
+$labels['logoutclear'] = 'X籀a th羅ng r獺c khi ����ng xu廕另';
+$labels['logoutcompact'] = 'N矇n h廙�p thが l廕【 khi ����ng xu廕另';
 $labels['uisettings'] = 'Giao di廙�n ngが廙�i d羅ng';
 $labels['serversettings'] = 'Thi廕篙 l廕計 m獺y ch廙�';
+$labels['mailboxview'] = 'Xem h廙�p thが';
+$labels['mdnrequests'] = 'Y礙u c廕吟 g廙虹 l廕【 x獺c nh廕要';
+$labels['askuser'] = 'H廙�i t繫i';
+$labels['autosend'] = 'G廙虹 x獺c nh廕要';
+$labels['autosendknown'] = 'G廙虹 x獺c nh廕要 t廙�i li礙n l廕︷ c廙吧 t繫i, n廕簑 kh繫ng th穫 h廙�i t繫i';
+$labels['autosendknownignore'] = 'G廙虹 x獺c nh廕要 t廙�i li礙n l廕︷ c廙吧 t繫i, n廕簑 kh繫ng th穫 b廙� qua';
 $labels['ignore'] = 'B廙� qua';
+$labels['readwhendeleted'] = '��獺nh d廕只 thが l�� ��瓊 ��廙�c khi x籀a';
+$labels['flagfordeletion'] = '��獺nh d廕只 thが ��廙� x籀a';
+$labels['skipdeleted'] = 'Kh繫ng hi廙�n thが ��瓊 x籀a';
+$labels['deletealways'] = 'N廕簑 vi廙�c chuy廙�n thが v��o th羅ng r獺c b廙� l廙�i th穫 x籀a ch繳ng.';
+$labels['deletejunk'] = 'X籀a thが tr廙帷 ti廕穆 trong th羅ng r獺c';
+$labels['showremoteimages'] = 'Hi廙�n th廙� 廕τh t廙� m獺y ch廙� kh獺c, ��が廙�ng li礙n k廕篙 kh獺c';
+$labels['fromknownsenders'] = 'T廙� ngが廙�i g廙虹 ��瓊 bi廕篙';
+$labels['always'] = 'lu繫n lu繫n';
+$labels['showinlineimages'] = 'Hi廙�n th廙� 廕τh ��穩nh k癡m ph穩a dが廙�i thが';
+$labels['autosavedraft'] = 'T廙� ��廙�ng lがu b廕τ nh獺p';
+$labels['everynminutes'] = 'c廙� $n ph繳t';
+$labels['keepalive'] = 'Ki廙�m tra thが ��廕積';
+$labels['never'] = 'kh繫ng bao gi廙�';
+$labels['immediately'] = 'ngay l廕計 t廙妾';
+$labels['messagesdisplaying'] = '��ang hi廙�n th廙� thが';
+$labels['messagescomposition'] = 'So廕》 thが';
+$labels['mimeparamfolding'] = 'T礙n u';
+$labels['2231folding'] = 'RFC 2231 ��廕囤 ��廙� (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'RFC 2047 ��廕囤 ��廙� (kh獺c)';
+$labels['force7bit'] = 'S廙� d廙叩g MIME m瓊 h籀a cho 8-bit characters';
+$labels['advancedoptions'] = 'T羅y ch廙�n n璽ng cao';
+$labels['focusonnewmessage'] = 'Hi廙�n th廙� c廙苔 s廙� thが m廙�i';
+$labels['checkallfolders'] = 'Ki廙�m tra thが m廙�i trong t廕另 c廕� thが m廙卉';
+$labels['displaynext'] = 'Sau khi x籀a thがu/chuy廙�n m��n h穫nh sang n廙�i dung thが k廕� ti廕穆';
+$labels['defaultfont'] = 'Ph繫ng ch廙� m廕搾 ��廙�nh c廙吧 thが c籀 m瓊 HTML';
+$labels['mainoptions'] = 'T羅y ch廙�n ch穩nh';
+$labels['browseroptions'] = 'T羅y ch廙�n Tr穫nh duy廙�t';
+$labels['section'] = 'M廙卉';
+$labels['maintenance'] = 'B廕υ tr穫';
+$labels['newmessage'] = 'Thが m廙�i';
+$labels['signatureoptions'] = 'C廕只 h穫nh ch廙� k羸 cu廙�i thが';
+$labels['whenreplying'] = 'Khi tr廕� l廙�i';
+$labels['replytopposting'] = 'b廕眩 ��廕吟 vi廕篙 thが m廙�i tr礙n n廙�i dung c廙吧 thが c觼';
+$labels['replybottomposting'] = 'b廕眩 ��廕吟 thが m廙�i dが廙�i n廙�i dung thが c觼';
+$labels['replyremovesignature'] = 'Khi tr廕� l廙�i b廙� ch廙� k羸 c觼 kh廙�i n廙�i dung thが';
+$labels['autoaddsignature'] = 'T廙� ��廙�ng th礙m ch廙� k羸';
+$labels['newmessageonly'] = 'ch廙� thが m廙�i';
+$labels['replyandforwardonly'] = 'ch廙� tr廕� l廙�i v�� chuy廙�n ti廕穆 thが';
+$labels['replysignaturepos'] = 'Khi ��ang tr廕� l廙�i ho廕搾 chuy廙�n ti廕穆 thが th礙m ch廙� k羸 v��o';
+$labels['belowquote'] = 'dが廙�i ph廕吵 quote';
+$labels['abovequote'] = 'tr礙n ph廕姊 quote';
+$labels['insertsignature'] = 'Ch癡n ch廙� k羸';
+$labels['previewpanemarkread'] = '��獺nh d廕哎 thが xem th廙� l�� ��瓊 ��廙�c';
+$labels['afternseconds'] = 'sau $n gi璽y';
+$labels['reqmdn'] = 'Lu繫n y礙u c廕吟 ��廙�a ch廙� nh廕要 thが khi b廕》 mu廙�n ngが廙�i g廙虹 tr廕� l廙�i l廕【 v��o thが n��y.';
+$labels['reqdsn'] = 'Lu繫n y礙u c廕季 th繫ng b獺o tr廕》g th獺i thが ��瓊 g廙虹';
+$labels['replysamefolder'] = '��がa c獺c thが tr廕� l廙�i nh廕要 ��が廙θ v��o c羅ng thが m廙卉 c廙吧 thが b廕》 nh廕要 ��が廙θ';
+$labels['defaultaddressbook'] = 'T廕︽ li礙n l廕︷ m廙�i';
+$labels['autocompletesingle'] = 'B廙� qua ��廙�a ch廙� email thay th廕� trong ch廕� ��廙� t廙� ��i廙�n th繫ng tin';
+$labels['listnamedisplay'] = 'Hi廙�n th廙� danh s獺ch li礙n l廕︷ nhが';
 $labels['spellcheckbeforesend'] = 'Ki廙�m tra ch穩nh t廕� trが廙�c khi g廙虹 tin nh廕疸';
 $labels['spellcheckoptions'] = 'T羅y ch廙�n ki廙�m tra ch穩nh t廕�';
 $labels['spellcheckignoresyms'] = 'B廙� qua t廙� k癡m bi廙�u tが廙τg';
 $labels['spellcheckignorenums'] = 'B廙� qua c獺c t廙� k癡m s廙�';
 $labels['spellcheckignorecaps'] = 'B廙� qua c獺c t廙� ��が廙θ vi廕篙 hoa';
 $labels['addtodict'] = 'Th礙m v��o t廙� ��i廙�n';
+$labels['mailtoprotohandler'] = '����ng k羸 giao th廙妾 cho mailto: li礙n k廕篙';
 $labels['folder'] = 'Thが m廙卉';
 $labels['foldername'] = 'T礙n thが m廙卉';
 $labels['subscribed'] = 'Cho s廙� d廙叩g';
@@ -310,14 +409,29 @@ $labels['properties'] = 'C獺c thu廙�c t穩nh';
 $labels['folderproperties'] = 'Thu廙�c t穩nh thが m廙卉';
 $labels['parentfolder'] = 'Thが m廙卉 b廙� m廕�';
 $labels['location'] = '��廙�a ��i廙�m';
+$labels['info'] = 'Th繫ng tin';
+$labels['getfoldersize'] = 'Nh廕叼 chu廙�t ��廙� xem k穩ch thが廙�c thが m廙卉';
+$labels['changesubscription'] = 'Nh廕叼 chu廙�t ��廙� ��廙�i subscription';
+$labels['foldertype'] = 'Ki廙�u thが m廙卉';
+$labels['personalfolder'] = 'Thが m廙卉 ri礙ng';
+$labels['otherfolder'] = 'C獺c thが m廙卉 kh獺c c廙吧 ngが廙�i d羅ng';
+$labels['sharedfolder'] = 'Thが m廙卉 Public';
 $labels['sortby'] = 'S廕皰 x廕穆';
 $labels['sortasc'] = 'X廕穆 t��ng d廕吵';
 $labels['sortdesc'] = 'X廕穆 gi廕σ d廕吵';
+$labels['undo'] = 'H廙囤 thao t獺c';
+$labels['plugin'] = 'M繫 ��un';
 $labels['version'] = 'Phi礙n b廕τ';
 $labels['source'] = 'Ngu廙�n';
 $labels['license'] = 'B廕τ quy廙�n';
 $labels['support'] = 'Nh廕要 h廙� tr廙�';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
 $labels['english'] = 'Ti廕積g Anh/ ngが廙�i Anh';
+$labels['easterneuropean'] = '��繫ng ��u';
 $labels['turkish'] = 'Ti廕積g Th廙� Nh藺 K廙�';
 $labels['nordic'] = 'Thu廙�c B廕畚 ��u (t穩nh t廙�)/ Ngが廙�i B廕畚 ��u (danh t廙�)';
 $labels['thai'] = 'Ngが廙�i Th獺i Lan, ti廕積g Th獺i Lan';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index f27ebb62f..c5db78cde 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -9,20 +9,29 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Hung Pham <phamhung77@gmail.com>                              |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Xu廕另 hi廙�n 1 l廙�i';
 $messages['loginfailed'] = 'Kh繫ng ����ng nh廕計 ��が廙θ';
 $messages['cookiesdisabled'] = 'Tr穫nh duy廙�t kh繫ng h廙� tr廙� cookies';
 $messages['sessionerror'] = 'Phi礙n l��m vi廙�c kh繫ng h廙φ l廙� ho廕搾 ��瓊 h廕篙 h廕》';
 $messages['storageerror'] = 'Kh繫ng k廕篙 n廙�i ��が廙θ v廙�i m獺y ch廙� IMAP';
+$messages['servererror'] = 'L廙�i m獺y ch廙�';
+$messages['servererrormsg'] = 'L廙�i m獺y ch廙�';
+$messages['dberror'] = 'L廙�i cヾ s廙� d廙� li廙�u';
+$messages['requesttimedout'] = 'Y礙u c廕吟 h廕篙  h廕》';
+$messages['errorreadonly'] = 'Kh繫ng th廙� th廙帷 hi廙�n hoat ��廙�ng. Folder ch廙� cho ph矇p ��廙�c.';
+$messages['errornoperm'] = 'Kh繫ng th廙� th廙帷 hi廙�n ho廕﹀ ��廙�ng繫iS廙� cho ph矇p b廙� t廙� ch廙�i';
+$messages['invalidrequest'] = 'Y礙u c廕吟 v繫 gi獺 tr廙�! Kh繫ng c籀 d廙� li廙�u n��o ��が廙θ lがu.';
 $messages['nomessagesfound'] = 'Kh繫ng c籀 thが trong h簷m thが n��y';
 $messages['loggedout'] = 'Phi礙n l��m vi廙�c ��瓊 k廕篙 th繳c. H廕雉 g廕搆 l廕【!';
 $messages['mailboxempty'] = 'H廙�p thが r廙�ng';
 $messages['loading'] = 'Vui l簷ng ch廙� trong gi璽y l獺t...';
+$messages['uploading'] = '��ang t廕ξ l礙n t廕計 tin...';
+$messages['uploadingmany'] = '��ang t廕ξ l礙n c獺c t廕計 tin';
 $messages['loadingdata'] = '��ang n廕︾ d廙� li廙�u...';
 $messages['checkingmail'] = 'Ki廙�m tra thが m廙�i...';
 $messages['sendingmessage'] = '��ang g廙虹 thが...';
@@ -32,30 +41,113 @@ $messages['messagesaved'] = 'Thが ��瓊 ��が廙θ g廙虹 v��o ng��n Drafts';
 $messages['successfullysaved'] = '��瓊 lがu th��nh c繫ng';
 $messages['addedsuccessfully'] = '��廙�a ch廙� li礙n h廙� ��瓊 ��が廙θ lがu';
 $messages['contactexists'] = '��廙�a ch廙� li礙n h廙� v廙�i e-mail n��y ��瓊 ��が廙θ lがu trが廙�c ��璽y';
+$messages['contactnameexists'] = '��瓊 t廙�n t廕【 m廙�t li礙n l廕︷ c籀 c羅ng t礙n';
 $messages['blockedimages'] = '��廙� b廕υ v廙� t穩nh ri礙ng tが, ch廙妾 n��ng hi廙�n 廕τh t廙� xa b廙� c廕叮 trong thが n��y.';
 $messages['encryptedmessage'] = 'Thが n��y ��が廙θ m瓊 h籀a, kh繫ng th廙� xem. R廕另 ti廕盧!';
 $messages['nocontactsfound'] = 'Kh繫ng t穫m th廕句 ��廙�a ch廙� li礙n h廙�';
+$messages['contactnotfound'] = 'Kh繫ng t穫m th廕句 li礙n l廕︷ ��が廙θ y礙u c廕吟';
+$messages['contactsearchonly'] = 'G繭 m廙�t v��i t廙� t廙� ki廕禦 ��廙� t穫m li礙n l廕︷';
 $messages['sendingfailed'] = 'Kh繫ng g廙虹 ��が廙θ thが';
+$messages['senttooquickly'] = 'Xin ��廙ξ v��i gi璽y trが廙�c khi g廙虹 thが n��y';
+$messages['errorsavingsent'] = 'Xu廕另 hi廙�n m廙�t l廙�i trong khi lがu thが ��瓊 g廙虹';
 $messages['errorsaving'] = 'L廙�i khi lがu';
 $messages['errormoving'] = 'Kh繫ng th廙� chuy廙�n ��が廙θ thが';
+$messages['errorcopying'] = 'Kh繫ng th廙� sao ch矇p thが';
 $messages['errordeleting'] = 'Kh繫ng th廙� x籀a ��が廙θ thが';
+$messages['errormarking'] = 'Kh繫ng th廙� ��獺nh d廕只 (c獺c) thが';
 $messages['deletecontactconfirm'] = 'X籀a b廙� c獺c ��廙�a ch廙� ��が廙θ ch廙�n?';
+$messages['deletegroupconfirm'] = 'B廕》 th廙帷 s廙� c籀 mu廙�n x籀a nh籀m ��瓊 ch廙�n?';
+$messages['deletemessagesconfirm'] = 'B廕》 th廙帷 s廙� c籀 mu廙�n x籀a (c獺c) thが ��瓊 ch廙�n?';
 $messages['deletefolderconfirm'] = 'X籀a b廙� thが m廙卉 n��y?';
 $messages['purgefolderconfirm'] = 'X籀a to��n b廙� thが trong thが m廙卉 n��o?';
+$messages['contactdeleting'] = '��ang x籀a (c獺c) li礙n l廕︷...';
+$messages['groupdeleting'] = '��ang x籀a nh籀m...';
+$messages['folderdeleting'] = '��ang x籀a folder...';
+$messages['foldermoving'] = '��ang chuy廙�n folder...';
+$messages['foldersubscribing'] = 'Nh廕計 v��o folder...';
+$messages['folderunsubscribing'] = 'Kh繫ng nh廕計 folder...';
 $messages['formincomplete'] = 'M廕哎 chがa ��が廙θ ��i廙�n xong';
 $messages['noemailwarning'] = 'Nh廕計 ��廙�a ch廙� email';
 $messages['nonamewarning'] = 'Nh廕計 t礙n';
 $messages['nopagesizewarning'] = 'Nh廕計 k穩ch c廙� c廙吧 trang';
+$messages['nosenderwarning'] = 'H瓊y nh廕計 ��廙�a ch廙� email ngが廙�i g廙虹';
 $messages['norecipientwarning'] = 'Thが c廕吵 c籀 it nh廕另 1 ngが廙�i nh廕要';
 $messages['nosubjectwarning'] = 'M廙卉 "Ti礙u ��廙�" chがa c籀. ��i廙�n ti礙u ��廙� ?';
 $messages['nobodywarning'] = 'Thが kh繫ng n廙�i dung, v廕南 ti廕穆 t廙卉 g廙虹?';
 $messages['notsentwarning'] = 'Thが chがa ��が廙θ g廙虹. B廙� qua thが ��ang so廕》?';
 $messages['noldapserver'] = 'Ch廙�n m獺y ch廙� ldap server ��廙� t穫m';
 $messages['nosearchname'] = 'Nh廕計 ��廙�a ch廙� ho廕搾 email';
+$messages['notuploadedwarning'] = 'T廕另 c廕� c獺c ��穩nh k癡m v廕南 chがa ��が廙θ t廕ξ l礙n h廕篙. Xin ��廙ξ ho廕搾 h廙囤 vi廙�c t廕ξ l礙n.';
 $messages['searchsuccessful'] = '$nr messages found';
 $messages['searchnomatch'] = 'Kh繫ng t穫m th廕句';
 $messages['searching'] = 'T穫m ki廕禦...';
 $messages['checking'] = 'Ki廙�m tra...';
 $messages['nospellerrors'] = 'Kh繫ng c籀 l廙�i ch穩nh t廕�';
 $messages['folderdeleted'] = 'Thが m廙卉 ��瓊 ��が廙θ x籀a';
+$messages['foldersubscribed'] = 'Folder ��が廙θ nh廕計 v��o th��nh c繫ng';
+$messages['folderunsubscribed'] = 'Folder kh繫ng nh廕計 v��o th��nh c繫ng';
+$messages['folderpurged'] = 'Folder ��が廙θ l��m tr廙�ng r廙�ng th��nh c繫ng';
+$messages['folderexpunged'] = 'Folder ��瓊 ��が廙θ n矇n l廕【 th��nh c繫ng';
+$messages['deletedsuccessfully'] = '��瓊 x籀a th��nh c繫ng';
+$messages['converting'] = 'Lo廕【 b廙� ��廙�nh d廕》g...';
+$messages['messageopenerror'] = 'Kh繫ng th廙� t廕ξ thが t廙� m獺y ch廙�';
+$messages['fileuploaderror'] = 'T廕ξ t廕計 tin l礙n th廕另 b廕【';
+$messages['filesizeerror'] = 'T廕計 tin ��が廙θ t廕ξ l礙n vが廙ㄅ qu獺 dung lが廙τg t廙�i ��a....';
+$messages['copysuccess'] = 'Sao ch矇p th��nh c繫ng ... ��廙�a ch廙�';
+$messages['copyerror'] = 'Kh繫ng th廙� sao ch矇p ��廙�a ch廙� n��o.';
+$messages['sourceisreadonly'] = 'Ngu廙�n ��廙�a ch廙� n��y ch廙� cho ��廙�c';
+$messages['errorsavingcontact'] = 'Kh繫ng th廙� lがu ��廙�a ch廙� li礙n l廕︷';
+$messages['movingmessage'] = '��ang chuy廙�n thが';
+$messages['copyingmessage'] = '��ang sao ch矇p thが';
+$messages['copyingcontact'] = '��ang sao ch矇p li礙n l廕︷...';
+$messages['deletingmessage'] = '��ang x籀a thが...';
+$messages['markingmessage'] = '��獺nh d廕只 thが...';
+$messages['addingmember'] = '��ang th礙m li礙n l廕︷ v��o nh籀m...';
+$messages['removingmember'] = '��ang x籀a li礙n l廕︷ t廙� nh籀m...';
+$messages['receiptsent'] = 'G廙虹 th��nh c繫ng ghi nh廕要 ��瓊 ��廙�c';
+$messages['errorsendingreceipt'] = 'Kh繫ng th廙� g廙虹 ghi nh廕要';
+$messages['deleteidentityconfirm'] = 'B廕》 c籀 th廙帷 s廙� mu廙�n x籀a nh廕要 d廕》g n��y?';
+$messages['nodeletelastidentity'] = 'B廕》 kh繫ng th廙� x籀a nh廕要 d廕》g n��y, ��籀 l�� c獺i cu廙�i c羅ng c廙吧 b廕》.';
+$messages['forbiddencharacter'] = 'T礙n folder ch廙奄 m廙�t k羸 t廙� b廙� c廕叮';
+$messages['selectimportfile'] = 'H瓊y ch廙�n t廙�p ��廙� t廕ξ l礙n';
+$messages['addresswriterror'] = 'S廙� ��廙�a ch廙� ��瓊 ch廙�n kh繫ng th廙� vi廕篙 l廕【 ��が廙θ';
+$messages['contactaddedtogroup'] = 'Th礙m li礙n l廕︷ v��o nh籀m n��y th��nh c繫ng';
+$messages['contactremovedfromgroup'] = 'X籀a li礙n l廕︷ kh廙�i nh籀m n��y th��nh c繫ng';
+$messages['importwait'] = 'Dang nh廕計, xin ch廙�...';
+$messages['importerror'] = 'Nh廕計 th廕另 b廕【! T廙�p t廕ξ l礙n kh繫ng ph廕ξ l�� t廙�p vCard h廙φ l廙�';
+$messages['opnotpermitted'] = 'Ho廕﹀ ��廙�ng kh繫ng ��が廙θ cho ph矇p!';
+$messages['nofromaddress'] = '��廙�a ch廙� email m廕另 廙� trong nh廕要 d廕》g ��瓊 ch廙�n';
+$messages['editorwarning'] = 'Vi廙�c chuy廙�n so廕》 th廕υ text g廙�c s廕� g璽y ra to��n b廙� ��廙�nh d廕》g text ��瓊 c籀 b廙� m廕另. B廕》 c籀 mu廙�n ti廕穆 t廙卉 kh繫ng?';
+$messages['httpreceivedencrypterror'] = 'Xu廕另 hi廙�n m廙�t l廙�i c廕只 h穫nh  tai h廕【. H瓊y li礙n h廙� v廙�i ng廙卻i qu廕τ tr廙� ng��y. <b> Thが c廙吧 b廕》 kh繫ng th廙� ��が廙θ g廙虹</b>';
+$messages['smtpconnerror'] = 'L廙�i SMTP: K廕篙 n廙�i t廙�i m獺y ch廙� b廙� l廙�i';
+$messages['smtpautherror'] = 'L廙�i SMTP: X獺c th廙帷 th廕另 b廕【';
+$messages['smtprecipientserror'] = 'L廙�i SMTP: kh繫ng th廙� ph璽n lo廕【 danh s獺ch ngが廙�i nh廕要';
+$messages['emailformaterror'] = '��廙�a ch廙� email kh繫ng h廙φ l廙�';
+$messages['toomanyrecipients'] = 'Qu獺 nhi廙�u ngが廙�i nh廕要. H瓊y gi廕σ s廙� lが廙τg ngが廙�i nh廕要 xu廙�ng';
+$messages['maxgroupmembersreached'] = 'S廙� lが廙τg th��nh vi礙n trong nh籀m vが廙ㄅ qu獺 m廙妾 t廙�i ��a l��';
+$messages['internalerror'] = 'Xu廕另 hi廙�n m廙�t l廙�i n廙�i b廙�. Xin h瓊y th廙� l廕【';
+$messages['contactdelerror'] = 'Kh繫ng th廙� x籀a li礙n l廕︷';
+$messages['contactdeleted'] = 'Li礙n l廕︷ ��が廙θ x籀a th��nh c繫ng';
+$messages['contactrestoreerror'] = 'Kh繫ng th廙� kh繫i ph廙卉 li礙n l廕︷ ��瓊 x籀a';
+$messages['contactrestored'] = 'Li礙n l廕︷ ��が廙θ kh繫i ph廙卉 th��nh c繫ng';
+$messages['groupdeleted'] = 'Nh籀m ��が廙θ x籀a th��nh c繫ng';
+$messages['grouprenamed'] = 'Nh籀m ��が廙θ ��廕暗 t礙n l廕【 th��nh c繫ng';
+$messages['groupcreated'] = 'Nh籀m ��が廙θ t廕︽ th��nh c繫ng';
+$messages['savedsearchdeleted'] = 'T穫m ki廕禦 ��瓊 lがu ��が廙θ x籀a th��nh c繫ng';
+$messages['savedsearchdeleteerror'] = 'Kh繫ng th廙� x籀a t穫m ki廕禦 ��瓊 lがu';
+$messages['savedsearchcreated'] = 'T穫m ki廕禦 ��瓊 lがu ��が廙θ t廕︽ th��nh c繫ng';
+$messages['savedsearchcreateerror'] = 'Kh繫ng th廙� t廕︽ t穫m ki廕禦 ��瓊 lがu';
+$messages['messagedeleted'] = 'Thが ��が廙θ x籀a th��nh c繫ng';
+$messages['messagemoved'] = 'Thが ��が廙θ chuy廙�n ��i th��nh c繫ng';
+$messages['messagecopied'] = 'Thが ��が廙θ sao ch矇p th��nh c繫ng';
+$messages['messagemarked'] = 'Thが ��が廙θ ��獺nh d廕只 th��nh c繫ng';
+$messages['autocompletemore'] = 'Nhi廙�u d廙� li廙�u ph羅 h廙φ hヾn ��が廙θ t穫m th廕句. H瓊y g繭 th礙m  k羸 t廙�.';
+$messages['namecannotbeempty'] = 'T礙n kh繫ng ��が廙θ ��廙� tr廙�ng';
+$messages['nametoolong'] = 'T礙n qu獺 d��i';
+$messages['folderupdated'] = 'Folder ��が廙θ c廕計 nh廕負 th��nh c繫ng';
+$messages['foldercreated'] = 'Folder  ��が廙θ t廕︽ th��nh c繫ng';
+$messages['invalidimageformat'] = 'Kh繫ng ph廕ξ l�� ��廙�nh d廕》g 廕τh h廙φ l廙�.';
+$messages['mispellingsfound'] = 'L廙�i ch穩nh t廕� ��が廙θ ph獺t hi廙�n trong thが';
+$messages['parentnotwritable'] = 'Kh繫ng th廙� t廕︽/chuy廙�n folder v��o folder g廙�c ��瓊 ch廙�n. Kh繫ng c籀 quy廙�n truy c廕計.';
+$messages['messagetoobig'] = 'M廙�t ph廕吵 thが qu獺 l廙�n ��廙� x廙� l羸 n籀.';
 
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 4f5492082..820978682 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denny Lin <dennylin93@hs.ntnu.edu.tw>                         |
+ | Author: Nansen                                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $messages = array();
@@ -23,6 +22,7 @@ $messages['storageerror'] = '���蝺���� IMAP 隡箸����典仃���';
 $messages['servererror'] = '隡箸����券�航炊嚗�';
 $messages['servererrormsg'] = '隡箸����券�航炊嚗�$msg';
 $messages['dberror'] = '鞈����摨恍�航炊!';
+$messages['requesttimedout'] = '閬�瘙���暹��';
 $messages['errorreadonly'] = '���雿���⊥��摰�������鞈����憭曉�航��';
 $messages['errornoperm'] = '���雿���⊥��摰�������甈����銝�蝚�';
 $messages['invalidrequest'] = '閬�瘙���⊥��嚗���芸�脣��隞颱��鞈�������';