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ập';
+$labels['username'] = 'Người dùng:';
+$labels['newuser'] = 'Thêm bài viết';
+$labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
+$labels['anonymous'] = 'Khách (vô hình)';
+$labels['acll'] = 'Tìm kiếm';
+$labels['shortacll'] = 'Tìm kiếm';
+$labels['aclr'] = 'Đọc thư';
+$labels['acli'] = 'Chèn thêm (sao chép vào)';
+$labels['aclp'] = 'Đăng bài';
+$labels['shortaclp'] = 'Đăng bài';
+$labels['aclc'] = 'Khởi tạo thư mục con';
+$labels['aclk'] = 'Khởi tạo thư mục con';
+$labels['acld'] = 'Xóa thư';
+$labels['aclt'] = 'Xóa thư';
+$labels['aclx'] = 'Xóa folder';
+$labels['acla'] = 'Quản lý';
+$labels['shortacla'] = 'Quản lý';
+$labels['aclfull'] = 'Quản lý toàn bộ';
+$labels['aclother'] = 'Loại khác';
+$labels['shortaclother'] = 'Loại khác';
+$labels['aclread'] = 'Đọc';
+$labels['shortaclr'] = 'Đọc';
+$labels['shortaclread'] = 'Đọc';
+$labels['aclwrite'] = 'Viết';
+$labels['shortaclw'] = 'Viết';
+$labels['shortaclwrite'] = 'Viết';
+$labels['acldelete'] = 'Xoá';
+$labels['shortacld'] = 'Xoá';
+$labels['shortaclt'] = 'Xoá';
+$labels['shortacldelete'] = 'Xoá';
+$labels['shortacls'] = 'Giữ';
+$labels['shortacli'] = 'Chèn';
+$labels['shortaclc'] = 'Tạo mới';
+$labels['shortaclk'] = 'Tạo mới';
+$labels['longacll'] = 'Thư mục có sẵn trong danh sách và có thể gửi tới';
+$labels['longaclr'] = 'Folder có thể được mở để đọc';
+$labels['longaclread'] = 'Folder có thể được mở để đọc';
+$labels['longacli'] = 'Thư có thể được ghi hoặc sao chép tới thư mục';
+$labels['longaclp'] = 'Thư có thể';
+$labels['longaclc'] = 'Cácthư mục có thể được tạo (hoặc đặt lại tên) trực tiếp dưới thư mục này';
+$labels['longaclk'] = 'Cácthư mục có thể được tạo (hoặc đặt lại tên) trực tiếp dưới thư mục này';
+$labels['longaclx'] = 'Folder có thể xóa được hoặc đặt lại tên';
+$labels['longacla'] = 'Quyênf truy cập folder có thể thay đổi';
+$labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả thư mục hành chính';
+$labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép tới thư mục';
+$labels['longacldelete'] = 'Thư có thể bị xóa';
+$labels['deleting'] = 'Xóa quyền truy cập...';
+$labels['saving'] = 'Lưu quyền truy cập...';
+$labels['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
+$labels['deletesuccess'] = 'Xóa quyền truy cập thành công...';
+$labels['createsuccess'] = 'Thêm quyền truy cập thành công...';
+$labels['deleteerror'] = 'Khôngthể xóa quyền truy cập';
+$labels['deleteconfirm'] = 'Bạn có chắc là muốn xóa bỏ quyền truy cập của người dùng được 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ản 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'] = 'Ẩn';
+$labels['show'] = 'Hiển thị';
+$labels['quotelimit'] = 'Ẩn trích dẫn 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ật khẩu';
+$labels['curpasswd'] = 'Mật khẩu hiện tại:';
+$labels['newpasswd'] = 'Mật khẩu mới:';
+$labels['confpasswd'] = 'Xá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 tại';
+$labels['passwordincorrect'] = 'Mật khẩu hiện thời không đúng';
+$labels['passwordinconsistency'] = 'Mật khẩu không khớp, hãy thử lại';
+$labels['crypterror'] = 'Không thể lưu mật khẩu mới. Thiếu chức năng mã hóa';
+$labels['connecterror'] = 'Không thể lưu mật mã 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 phải dài ít nhất $ ký tự';
+$labels['passwordweak'] = 'Mật khẩu phải chứa ít nhất 1 con số và 1 ký tự dấu câu';
+$labels['passwordforbidden'] = 'Mật khẩu chứa ký bị 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']  = '使用IMAP訂閱';
+$labels['useimapsubscriptions'] = '使用IMAP訂閱';
 
-?>
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ựa chọn danh sách';
 $labels['mailboxlist'] = 'Thư mục';
 $labels['folders'] = 'Thư mục';
 $labels['messagesfromto'] = 'Thư $from - $to / $count';
+$labels['threadsfromto'] = 'Email từ $from đến $to của tổng $count';
 $labels['messagenrof'] = 'Thư $nr / $count';
+$labels['fromtoshort'] = '$from - $to của $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ặc tới ngườ
 $labels['replyall'] = 'Trả lời tất cả';
 $labels['replylist'] = 'Danh sách trả lời';
 $labels['forward'] = 'Chuyển tiếp';
+$labels['forwardinline'] = 'Chuyển tiếp thư';
+$labels['forwardattachment'] = 'Chuyển tiếp như đính kèm';
 $labels['forwardmessage'] = 'Chuyển tiếp 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ấu';
 $labels['unanswered'] = 'Chưa được trả lời';
 $labels['deleted'] = 'Đã được xóa';
+$labels['invert'] = 'Đảo ngược';
 $labels['filter'] = 'Lọc';
 $labels['list'] = 'Danh sách';
 $labels['threads'] = 'Mối nguy hiểm';
 $labels['expand-all'] = 'Mở rộng tất cả';
 $labels['expand-unread'] = 'Mở rộng thư chưa đọc';
+$labels['collapse-all'] = 'Đóng hết';
+$labels['threaded'] = 'Đã được phân loại';
+$labels['autoexpand_threads'] = 'Mở rộng các thư';
+$labels['do_expand'] = 'Tất cả các thư';
 $labels['expand_only_unread'] = 'Chỉ với những thư chưa đọc';
 $labels['fromto'] = 'Từ/Đến';
 $labels['flag'] = 'Đánh dấu';
+$labels['attachment'] = 'Đính kèm';
 $labels['sentdate'] = 'Ngày gửi';
 $labels['arrival'] = 'Ngày đến';
 $labels['asc'] = 'Tăng dần';
@@ -155,22 +164,29 @@ $labels['unknown'] = 'Không rõ';
 $labels['unlimited'] = 'Không hạn chế';
 $labels['quicksearch'] = 'Tìm nhanh';
 $labels['resetsearch'] = 'Thiết lập lại tìm kiếm';
+$labels['searchmod'] = 'TÌm người sửa';
 $labels['msgtext'] = 'Toàn bộ thư';
 $labels['openinextwin'] = 'Mở bằng cửa sổ mới';
+$labels['emlsave'] = 'Tải về';
 $labels['editasnew'] = 'Sửa thành mới';
 $labels['savemessage'] = 'Lưu dạng nháp';
 $labels['sendmessage'] = 'Gửi thư';
 $labels['addattachment'] = 'Đính kèm tập tin';
 $labels['charset'] = 'Bộ ký tự';
+$labels['editortype'] = 'Loại soạn thảo';
 $labels['returnreceipt'] = 'Báo nhận';
 $labels['dsn'] = 'Thông báo tình trạng phân phát thư';
+$labels['mailreplyintro'] = 'Vào ngày $date, $sender viết:';
+$labels['originalmessage'] = 'Thư gốc';
 $labels['editidents'] = 'Chỉnh sửa nhận dạng';
 $labels['spellcheck'] = 'Đánh vần';
 $labels['checkspelling'] = 'Kiểm tra chính tả';
 $labels['resumeediting'] = 'Soạn thảo';
 $labels['revertto'] = 'Chuyển về';
+$labels['attach'] = 'Đính kèm';
 $labels['attachments'] = 'Gửi kèm';
 $labels['upload'] = 'Tải lên';
+$labels['uploadprogress'] = '$percent ($current từ $total)';
 $labels['close'] = 'Đóng';
 $labels['messageoptions'] = 'Tùy chọn cho thư...';
 $labels['low'] = 'Thấp';
@@ -190,7 +206,10 @@ $labels['maxuploadsize'] = 'Dung lượng 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ửi thư này yêu cầu được thông báo khi bạn đã đọc thư này. Bạn có muốn thông báo cho người gửi không?';
+$labels['receiptread'] = 'Trả lại xác nhận (đã đọc)';
+$labels['yourmessage'] = 'Đây là sự trả lại xác nhận cho thư của bạn';
 $labels['receiptnote'] = 'Lưu ý: Việc nhận này chỉ báo rằng thư đã được hiển thị trên máy tính của người nhận. Không có đảm bảo nào rằng người nhận đó đã đọc hoặc 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ức 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ại';
 $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ắn';
 $labels['notes'] = 'Các ghi chú';
 $labels['male'] = 'Nam';
 $labels['female'] = 'Nữ';
 $labels['manager'] = 'Người quản lý';
 $labels['assistant'] = 'Trợ lý';
 $labels['typeassistant'] = 'Trợ lý';
+$labels['spouse'] = 'Vợ/Chồng';
+$labels['allfields'] = 'Tất cả các lĩnh vực';
 $labels['search'] = 'Tìm kiếm';
 $labels['advsearch'] = 'Tìm kiếm nâng cao';
+$labels['advanced'] = 'Nâng cao';
 $labels['other'] = 'Loại khác';
 $labels['typeother'] = 'Loại khác';
+$labels['typehome'] = 'Thư mục 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ắn tin';
+$labels['typevideo'] = 'Video';
 $labels['typehomepage'] = 'Trang chủ';
+$labels['typeblog'] = 'Nhật ký Mạng';
 $labels['typeprofile'] = 'Hồ sơ';
+$labels['addfield'] = 'Thêm lĩnh vực...';
 $labels['addcontact'] = 'Thêm một liên hệ mới';
 $labels['editcontact'] = 'Sửa liên lạc';
 $labels['contacts'] = 'Danh bạ';
+$labels['contactproperties'] = 'Tính chất của liên hệ';
 $labels['personalinfo'] = 'Thông tin cá nhân';
 $labels['edit'] = 'Sửa đổi';
 $labels['cancel'] = 'Huỷ bỏ';
@@ -248,6 +279,7 @@ $labels['composeto'] = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Địa chỉ từ $from - $to / $count';
 $labels['print'] = 'In thư';
 $labels['export'] = 'Xuất ra';
+$labels['exportvcards'] = 'Xuất các liên lạc theo định dạng vCard';
 $labels['newcontactgroup'] = 'Tạo nhóm liên lạc 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ếm';
 $labels['searchdelete'] = 'Xóa tìm kiếm';
 $labels['import'] = 'Nhập';
 $labels['importcontacts'] = 'Nhập liên lạc';
+$labels['importfromfile'] = 'Nhập từ tệp:';
 $labels['importtarget'] = 'Thêm liên lạc mới vào sổ địa chỉ';
 $labels['importreplace'] = 'Thay thế toàn bộ sổ địa chỉ';
 $labels['importtext'] = 'Bạn có thể tải liên lạc lên từ sổ địa chỉ sẵn có.<br/> Chúng tôi hỗ trợ nhập địa chỉ từ <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
 $labels['done'] = 'Đã xong';
 $labels['settingsfor'] = 'Thiết lập cho';
 $labels['about'] = 'Giới thiệu';
+$labels['preferences'] = 'Sở thích';
 $labels['userpreferences'] = 'Tham số người dùng';
 $labels['editpreferences'] = 'Sửa đổi';
 $labels['identities'] = 'Người dùng';
@@ -277,6 +311,7 @@ $labels['newidentity'] = 'Người dùng mới';
 $labels['newitem'] = 'Mục mới';
 $labels['edititem'] = 'Sửa đổi mục';
 $labels['preferhtml'] = 'Hiển thị HTML';
+$labels['defaultcharset'] = 'Bộ ký tự mặc định';
 $labels['htmlmessage'] = 'Thư kiểu HTML';
 $labels['dateformat'] = 'Định dạng ngày';
 $labels['timeformat'] = 'Định dạng 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ạn thư dạng HTML';
+$labels['htmlonreply'] = 'Chỉ trả lời lại bằng thư HTML';
+$labels['htmlsignature'] = 'Chữ ký HTML';
+$labels['previewpane'] = 'Hiện ô Xem thử';
+$labels['skin'] = 'Bề mặt giao diện';
+$labels['logoutclear'] = 'Xóa thùng rác khi đăng xuất';
+$labels['logoutcompact'] = 'Nén hộp thư lại khi đăng xuất';
 $labels['uisettings'] = 'Giao diện người dùng';
 $labels['serversettings'] = 'Thiết lập máy chủ';
+$labels['mailboxview'] = 'Xem hộp thư';
+$labels['mdnrequests'] = 'Yêu cầu gửi lại xác nhận';
+$labels['askuser'] = 'Hỏi tôi';
+$labels['autosend'] = 'Gửi xác nhận';
+$labels['autosendknown'] = 'Gửi xác nhận tới liên lạc của tôi, nếu không thì hỏi tôi';
+$labels['autosendknownignore'] = 'Gửi xác nhận tới liên lạc của tôi, nếu không thì bỏ qua';
 $labels['ignore'] = 'Bỏ qua';
+$labels['readwhendeleted'] = 'Đánh dấu thư là đã đọc khi xóa';
+$labels['flagfordeletion'] = 'Đánh dấu thư để xóa';
+$labels['skipdeleted'] = 'Không hiện thư đã xóa';
+$labels['deletealways'] = 'Nếu 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ực tiếp trong thùng rác';
+$labels['showremoteimages'] = 'Hiển thị ảnh từ máy chủ khác, đường liên kết khác';
+$labels['fromknownsenders'] = 'Từ người gửi đã biết';
+$labels['always'] = 'luôn luôn';
+$labels['showinlineimages'] = 'Hiển thị ảnh đính kèm phía dưới thư';
+$labels['autosavedraft'] = 'Tự động lưu bản nháp';
+$labels['everynminutes'] = 'cứ $n phút';
+$labels['keepalive'] = 'Kiểm tra thư đến';
+$labels['never'] = 'không bao giờ';
+$labels['immediately'] = 'ngay lập tức';
+$labels['messagesdisplaying'] = 'Đang hiển thị thư';
+$labels['messagescomposition'] = 'Soạn thư';
+$labels['mimeparamfolding'] = 'Tên u';
+$labels['2231folding'] = 'RFC 2231 đầy đủ (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'RFC 2047 đầy đủ (khác)';
+$labels['force7bit'] = 'Sử dụng MIME mã hóa cho 8-bit characters';
+$labels['advancedoptions'] = 'Tùy chọn nâng cao';
+$labels['focusonnewmessage'] = 'Hiển thị cửa sổ thư mới';
+$labels['checkallfolders'] = 'Kiểm tra thư mới trong tất cả thư mục';
+$labels['displaynext'] = 'Sau khi xóa thưu/chuyển màn hình sang nội dung thư kế tiếp';
+$labels['defaultfont'] = 'Phông chữ mặc định của 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ục';
+$labels['maintenance'] = 'Bảo trì';
+$labels['newmessage'] = 'Thư mới';
+$labels['signatureoptions'] = 'Cấu hình chữ ký cuối thư';
+$labels['whenreplying'] = 'Khi trả lời';
+$labels['replytopposting'] = 'bắt đầu viết thư mới trên nội dung của thư cũ';
+$labels['replybottomposting'] = 'bắt đầu 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ếp thư';
+$labels['replysignaturepos'] = 'Khi đang trả lời hoặc chuyển tiếp thư thêm chữ ký vào';
+$labels['belowquote'] = 'dưới phần quote';
+$labels['abovequote'] = 'trên phẩn quote';
+$labels['insertsignature'] = 'Chèn chữ ký';
+$labels['previewpanemarkread'] = 'Đánh dẫu thư xem thử là đã đọc';
+$labels['afternseconds'] = 'sau $n giây';
+$labels['reqmdn'] = 'Luôn yêu cầu địa chỉ nhận thư khi bạn muốn người gửi trả lời lại vào thư này.';
+$labels['reqdsn'] = 'Luôn yêu cẩu thông báo trạng thái thư đã gửi';
+$labels['replysamefolder'] = 'Đưa các thư trả lời nhận được vào cùng thư mục của thư bạn nhận được';
+$labels['defaultaddressbook'] = 'Tạo liên lạc 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ạc như';
 $labels['spellcheckbeforesend'] = 'Kiểm tra chính tả trước khi gửi tin nhắn';
 $labels['spellcheckoptions'] = 'Tùy chọn kiểm tra chính tả';
 $labels['spellcheckignoresyms'] = 'Bỏ qua từ kèm biểu tượng';
 $labels['spellcheckignorenums'] = 'Bỏ qua các từ kèm số';
 $labels['spellcheckignorecaps'] = 'Bỏ qua các từ được viết hoa';
 $labels['addtodict'] = 'Thêm vào từ điển';
+$labels['mailtoprotohandler'] = 'Đăng ký giao thức cho mailto: liên kết';
 $labels['folder'] = 'Thư mục';
 $labels['foldername'] = 'Tên thư mục';
 $labels['subscribed'] = 'Cho sử dụng';
@@ -310,14 +409,29 @@ $labels['properties'] = 'Các thuộc tính';
 $labels['folderproperties'] = 'Thuộc tính thư mục';
 $labels['parentfolder'] = 'Thư mục bố mẹ';
 $labels['location'] = 'Địa điểm';
+$labels['info'] = 'Thông tin';
+$labels['getfoldersize'] = 'Nhấp chuột để xem kích thước thư mục';
+$labels['changesubscription'] = 'Nhấp chuột để đổi subscription';
+$labels['foldertype'] = 'Kiểu thư mục';
+$labels['personalfolder'] = 'Thư mục riêng';
+$labels['otherfolder'] = 'Các thư mục khác của người dùng';
+$labels['sharedfolder'] = 'Thư mục Public';
 $labels['sortby'] = 'Sắp xếp';
 $labels['sortasc'] = 'Xếp tăng dần';
 $labels['sortdesc'] = 'Xếp giảm dần';
+$labels['undo'] = 'Hủy thao tác';
+$labels['plugin'] = 'Mô đun';
 $labels['version'] = 'Phiên bản';
 $labels['source'] = 'Nguồn';
 $labels['license'] = 'Bản quyền';
 $labels['support'] = 'Nhận hỗ trợ';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
 $labels['english'] = 'Tiếng Anh/ người Anh';
+$labels['easterneuropean'] = 'Đông Âu';
 $labels['turkish'] = 'Tiếng Thổ Nhĩ Kỳ';
 $labels['nordic'] = 'Thuộc Bắc Âu (tính từ)/ Người Bắc Âu (danh từ)';
 $labels['thai'] = 'Người Thái Lan, tiếng 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ất hiện 1 lỗi';
 $messages['loginfailed'] = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
 $messages['sessionerror'] = 'Phiên làm việc không hợp lệ hoặc đã hết hạn';
 $messages['storageerror'] = 'Không kết nối được 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ầu hết  hạn';
+$messages['errorreadonly'] = 'Không thể thực hiện hoat động. Folder chỉ cho phép đọc.';
+$messages['errornoperm'] = 'Không thể thực hiện hoạt độngôiSự cho phép bị từ chối';
+$messages['invalidrequest'] = 'Yêu cầu vô giá trị! Không có dữ liệu nào được lưu.';
 $messages['nomessagesfound'] = 'Không có thư trong hòm thư này';
 $messages['loggedout'] = 'Phiên làm việc đã kết thúc. Hẹn gặp lại!';
 $messages['mailboxempty'] = 'Hộp thư rỗng';
 $messages['loading'] = 'Vui lòng chờ trong giây lát...';
+$messages['uploading'] = 'Đang tải lên tập tin...';
+$messages['uploadingmany'] = 'Đang tải lên các tập tin';
 $messages['loadingdata'] = 'Đang nạp dữ liệu...';
 $messages['checkingmail'] = 'Kiểm tra thư mới...';
 $messages['sendingmessage'] = 'Đang gửi thư...';
@@ -32,30 +41,113 @@ $messages['messagesaved'] = 'Thư đã được gửi vào ngăn Drafts';
 $messages['successfullysaved'] = 'Đã lưu thành công';
 $messages['addedsuccessfully'] = 'Địa chỉ liên hệ đã được lưu';
 $messages['contactexists'] = 'Địa chỉ liên hệ với e-mail này đã được lưu trước đây';
+$messages['contactnameexists'] = 'Đã tồn tại một liên lạc có cùng tên';
 $messages['blockedimages'] = 'Để bảo vệ tính riêng tư, chức năng hiện ảnh từ xa bị cấm trong thư này.';
 $messages['encryptedmessage'] = 'Thư này được mã hóa, không thể xem. Rất tiếc!';
 $messages['nocontactsfound'] = 'Không tìm thấy địa chỉ liên hệ';
+$messages['contactnotfound'] = 'Không tìm thấy liên lạc được yêu cầu';
+$messages['contactsearchonly'] = 'Gõ một vài từ từ kiếm để tìm liên lạc';
 $messages['sendingfailed'] = 'Không gửi được thư';
+$messages['senttooquickly'] = 'Xin đợi vài giây trước khi gửi thư này';
+$messages['errorsavingsent'] = 'Xuất hiện một lỗi trong khi lưu thư đã gửi';
 $messages['errorsaving'] = 'Lỗi khi lưu';
 $messages['errormoving'] = 'Không thể chuyển được thư';
+$messages['errorcopying'] = 'Không thể sao chép thư';
 $messages['errordeleting'] = 'Không thể xóa được thư';
+$messages['errormarking'] = 'Không thể đánh dấu (các) thư';
 $messages['deletecontactconfirm'] = 'Xóa bỏ các địa chỉ được chọn?';
+$messages['deletegroupconfirm'] = 'Bạn thực sự có muốn xóa nhóm đã chọn?';
+$messages['deletemessagesconfirm'] = 'Bạn thực sự có muốn xóa (các) thư đã chọn?';
 $messages['deletefolderconfirm'] = 'Xóa bỏ thư mục này?';
 $messages['purgefolderconfirm'] = 'Xóa toàn bộ thư trong thư mục nào?';
+$messages['contactdeleting'] = 'Đang xóa (các) liên lạc...';
+$messages['groupdeleting'] = 'Đang xóa nhóm...';
+$messages['folderdeleting'] = 'Đang xóa folder...';
+$messages['foldermoving'] = 'Đang chuyển folder...';
+$messages['foldersubscribing'] = 'Nhập vào folder...';
+$messages['folderunsubscribing'] = 'Không nhập folder...';
 $messages['formincomplete'] = 'Mẫu chưa được điền xong';
 $messages['noemailwarning'] = 'Nhập địa chỉ email';
 $messages['nonamewarning'] = 'Nhập tên';
 $messages['nopagesizewarning'] = 'Nhập kích cỡ của trang';
+$messages['nosenderwarning'] = 'Hãy nhập địa chỉ email người gửi';
 $messages['norecipientwarning'] = 'Thư cần có it nhất 1 người nhận';
 $messages['nosubjectwarning'] = 'Mục "Tiêu đề" chưa có. Điền tiêu đề ?';
 $messages['nobodywarning'] = 'Thư không nội dung, vẫn tiếp tục gửi?';
 $messages['notsentwarning'] = 'Thư chưa được gửi. Bỏ qua thư đang soạn?';
 $messages['noldapserver'] = 'Chọn máy chủ ldap server để tìm';
 $messages['nosearchname'] = 'Nhập địa chỉ hoặc email';
+$messages['notuploadedwarning'] = 'Tất cả các đính kèm vẫn chưa được tải lên hết. Xin đợi hoặc hủy việc tải lên.';
 $messages['searchsuccessful'] = '$nr messages found';
 $messages['searchnomatch'] = 'Không tìm thấy';
 $messages['searching'] = 'Tìm kiếm...';
 $messages['checking'] = 'Kiểm tra...';
 $messages['nospellerrors'] = 'Không có lỗi chính tả';
 $messages['folderdeleted'] = 'Thư mục đã được xóa';
+$messages['foldersubscribed'] = 'Folder được nhập vào thành công';
+$messages['folderunsubscribed'] = 'Folder không nhập vào thành công';
+$messages['folderpurged'] = 'Folder được làm trống rỗng thành công';
+$messages['folderexpunged'] = 'Folder đã được nén lại thành công';
+$messages['deletedsuccessfully'] = 'Đã xóa thành công';
+$messages['converting'] = 'Loại bỏ định dạng...';
+$messages['messageopenerror'] = 'Không thể tải thư từ máy chủ';
+$messages['fileuploaderror'] = 'Tải tập tin lên thất bại';
+$messages['filesizeerror'] = 'Tập tin được tải lên vượt quá dung lượng 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ạc';
+$messages['movingmessage'] = 'Đang chuyển thư';
+$messages['copyingmessage'] = 'Đang sao chép thư';
+$messages['copyingcontact'] = 'Đang sao chép liên lạc...';
+$messages['deletingmessage'] = 'Đang xóa thư...';
+$messages['markingmessage'] = 'Đánh dấu thư...';
+$messages['addingmember'] = 'Đang thêm liên lạc vào nhóm...';
+$messages['removingmember'] = 'Đang xóa liên lạc từ nhóm...';
+$messages['receiptsent'] = 'Gửi thành công ghi nhận đã đọc';
+$messages['errorsendingreceipt'] = 'Không thể gửi ghi nhận';
+$messages['deleteidentityconfirm'] = 'Bạn có thực sự muốn xóa nhận dạng này?';
+$messages['nodeletelastidentity'] = 'Bạn không thể xóa nhận dạng này, đó là cái cuối cùng của bạn.';
+$messages['forbiddencharacter'] = 'Tên folder chứa một ký tự bị cấm';
+$messages['selectimportfile'] = 'Hãy chọn tệp để tải lên';
+$messages['addresswriterror'] = 'Sổ địa chỉ đã chọn không thể viết lại được';
+$messages['contactaddedtogroup'] = 'Thêm liên lạc vào nhóm này thành công';
+$messages['contactremovedfromgroup'] = 'Xóa liên lạc khỏi nhóm này thành công';
+$messages['importwait'] = 'Dang nhập, xin chờ...';
+$messages['importerror'] = 'Nhập thất bại! Tệp tải lên không phải là tệp vCard hợp lệ';
+$messages['opnotpermitted'] = 'Hoạt động không được cho phép!';
+$messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
+$messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
+$messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với ngừoi quản trị ngày. <b> Thư của bạn không thể được gửi</b>';
+$messages['smtpconnerror'] = 'Lỗi SMTP: Kết nỗi tới máy chủ bị lỗi';
+$messages['smtpautherror'] = 'Lỗi SMTP: Xác thực thất bại';
+$messages['smtprecipientserror'] = 'Lỗi SMTP: không thể phân loại danh sách người nhận';
+$messages['emailformaterror'] = 'Địa chỉ email không hợp lệ';
+$messages['toomanyrecipients'] = 'Quá nhiều người nhận. Hãy giảm số lượng người nhận xuống';
+$messages['maxgroupmembersreached'] = 'Số lượng thành viên trong nhóm vượt quá mức tối đa là';
+$messages['internalerror'] = 'Xuất hiện một lỗi nội bộ. Xin hãy thử lại';
+$messages['contactdelerror'] = 'Không thể xóa liên lạc';
+$messages['contactdeleted'] = 'Liên lạc được xóa thành công';
+$messages['contactrestoreerror'] = 'Không thể khôi phục liên lạc đã xóa';
+$messages['contactrestored'] = 'Liên lạc được khôi phục thành công';
+$messages['groupdeleted'] = 'Nhóm được xóa thành công';
+$messages['grouprenamed'] = 'Nhóm được đặt tên lại thành công';
+$messages['groupcreated'] = 'Nhóm được tạo thành công';
+$messages['savedsearchdeleted'] = 'Tìm kiếm đã lưu được xóa thành công';
+$messages['savedsearchdeleteerror'] = 'Không thể xóa tìm kiếm đã lưu';
+$messages['savedsearchcreated'] = 'Tìm kiếm đã lưu được tạo thành công';
+$messages['savedsearchcreateerror'] = 'Không thể tạo tìm kiếm đã lưu';
+$messages['messagedeleted'] = 'Thư được xóa thành công';
+$messages['messagemoved'] = 'Thư được chuyển đi thành công';
+$messages['messagecopied'] = 'Thư được sao chép thành công';
+$messages['messagemarked'] = 'Thư được đánh dấu thành công';
+$messages['autocompletemore'] = 'Nhiều dữ liệu phù hợp hơn được tìm thấy. Hãy gõ thêm  ký tự.';
+$messages['namecannotbeempty'] = 'Tên không được để trống';
+$messages['nametoolong'] = 'Tên quá dài';
+$messages['folderupdated'] = 'Folder được cập nhật thành công';
+$messages['foldercreated'] = 'Folder  được tạo thành công';
+$messages['invalidimageformat'] = 'Không phải là định dạng ảnh hợp lệ.';
+$messages['mispellingsfound'] = 'Lỗi chính tả được phát hiện trong thư';
+$messages['parentnotwritable'] = 'Không thể tạo/chuyển folder vào folder gốc đã chọn. Không có quyền truy cập.';
+$messages['messagetoobig'] = 'Một phần 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'] = '要求無效！未儲存任何資料。';