Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

8 files changed, 139 insertions, 1 deletions

diff --git a/plugins/acl/localization/ast.inc b/plugins/acl/localization/ast.inc
new file mode 100644
index 000000000..2932d3bd4
--- /dev/null
+++ b/plugins/acl/localization/ast.inc
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Compartición';
+$labels['myrights'] = 'Drechos d\'accesu';
+$labels['username'] = 'Usuariu:';
+$labels['advanced'] = 'Mou avanzáu';
+$labels['newuser'] = 'Amestar entrada';
+$labels['editperms'] = 'Editar permisos';
+$labels['actions'] = 'Aición de drechos d\'accesu...';
+$labels['anyone'] = 'Tolos usuarios (toos)';
+$labels['anonymous'] = 'Convidaos (anónimos)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Guetar';
+$labels['aclr'] = 'Lleer mensaxes';
+$labels['acls'] = 'Estáu Caltener Vistu';
+$labels['aclw'] = 'Escribir banderes';
+$labels['acli'] = 'Inxertar (copiar a)';
+$labels['aclc'] = 'Crear subcarpetes';
+$labels['aclk'] = 'Crear subcarpetes';
+$labels['acld'] = 'Desaniciar mensaxes';
+$labels['aclt'] = 'Desaniciar mensaxes';
+$labels['acle'] = 'Desanciar';
+$labels['aclx'] = 'Desaniciar carpeta';
+$labels['acla'] = 'Alministrar';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Otru';
+$labels['aclread'] = 'Lleer';
+$labels['aclwrite'] = 'Escribir';
+$labels['acldelete'] = 'Desaniciar';
+$labels['shortacll'] = 'Guetar';
+$labels['shortaclr'] = 'Lleer';
+$labels['shortacls'] = 'Caltener';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Inxertar';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Desaniciar';
+$labels['shortaclt'] = 'Desaniciar';
+$labels['shortacle'] = 'Desaniciar';
+$labels['shortaclx'] = 'Desaniciu de carpeta';
+$labels['shortacla'] = 'Alministrar';
+$labels['shortaclother'] = 'Otru';
+$labels['shortaclread'] = 'Lleer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Desaniciar';
+$labels['longacll'] = 'La carpeta ye visible nes llistes y pue soscribise a';
+$labels['longaclr'] = 'La carpeta nun pue abrise pa leer';
+$labels['longaclx'] = 'La carpeta pue desaniciase o renomase';
+$labels['longacla'] = 'Puen camudase los drechos d\'accesu de la carpeta';
+$labels['longaclfull'] = 'Control completu incluyendo l\'alminitración de carpeta';
+$labels['longaclread'] = 'La carpeta pue abrise pa llectura';
+$labels['longaclwrite'] = 'Los mensaxes puen conseñase, escribise o copiase a la carpeta';
+$labels['longacldelete'] = 'Los mensaxes puen desaniciase';
+$labels['longaclother'] = 'Otros drechos d\'accesu';
+$labels['ariasummaryacltable'] = 'Llista de drechos d\'accesu';
+$messages['deleting'] = 'Desaniciando los drechos d\'accesu...';
+$messages['saving'] = 'Guardando los drechos d\'accesu...';
+$messages['updatesuccess'] = 'Camudaos con ésitu los drechos d\'accesu';
+$messages['deletesuccess'] = 'Desaniciaos con ésitu los drechos d\'accesu';
+$messages['createsuccess'] = 'Amestaos con ésitu los drechos d\'accesu';
+$messages['updateerror'] = 'Nun puen anovase los drechos d\'accesu';
+$messages['deleteerror'] = 'Nun puen desaniciase los drechos d\'accesu';
+$messages['createerror'] = 'Nun puen amestase los drechos d\'accesu';
+$messages['deleteconfirm'] = '¿De xuru quies desaniciar los drechos d\'accesu al(a los) usuariu(os) esbilláu(os)?';
+?>
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 7cedc8c5c..371dd17af 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
-$labels['advanced'] = 'napredni mod';
+$labels['advanced'] = 'Napredni mod';
 $labels['newuser'] = 'Dodaj unos';
+$labels['editperms'] = 'Uredi dozvole';
 $labels['actions'] = 'Akcije za prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (bilo ko)';
 $labels['anonymous'] = 'Gosti (anonimno)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Obriši poruke';
 $labels['acle'] = 'Izbriši';
 $labels['aclx'] = 'Obriši folder';
 $labels['acla'] = 'Administracija';
+$labels['acln'] = 'Obilježi poruke';
 $labels['aclfull'] = 'Puna kontrola';
 $labels['aclother'] = 'Ostalo';
 $labels['aclread'] = 'Pročitano';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Obriši';
 $labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
 $labels['shortacla'] = 'Administracija';
+$labels['shortacln'] = 'Obilježli';
 $labels['shortaclother'] = 'Ostalo';
 $labels['shortaclread'] = 'Pročitano';
 $labels['shortaclwrite'] = 'Piši';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Dijeljeni podaci (obilježavanja) poruka mogu se mijenjati';
 $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
 $labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
 $labels['longacldelete'] = 'Moguće je obrisati poruke';
+$labels['longaclother'] = 'Ostala prava pristupa';
+$labels['ariasummaryacltable'] = 'Lista prava pristupa';
+$labels['arialabelaclactions'] = 'Lista akcija';
+$labels['arialabelaclform'] = 'Obrazac za prava pristupa';
 $messages['deleting'] = 'Brišem prava pristupa...';
 $messages['saving'] = 'Snimam prava pristupa...';
 $messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
diff --git a/plugins/acl/localization/en_CA.inc b/plugins/acl/localization/en_CA.inc
index 53d14ff9a..ae9cb8bbe 100644
--- a/plugins/acl/localization/en_CA.inc
+++ b/plugins/acl/localization/en_CA.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -71,6 +75,7 @@ $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['longacln'] = 'Messages shared metadata (annotations) can be changed';
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
diff --git a/plugins/acl/localization/en_US.inc b/plugins/acl/localization/en_US.inc
index 23501dafe..ff8dde76c 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -87,6 +87,11 @@ $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Messages can be deleted';
+$labels['longaclother'] = 'Other access rights';
+
+$labels['ariasummaryacltable'] = 'List of access rights';
+$labels['arialabelaclactions'] = 'List actions';
+$labels['arialabelaclform'] = 'Access rights form';
 
 $messages['deleting'] = 'Deleting access rights...';
 $messages['saving'] = 'Saving access rights...';
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 4b6f437aa..ecd5f7e8f 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -18,12 +18,17 @@
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
+$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['editperms'] = 'Muuda õigusi';
 $labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
 $labels['identifier'] = 'Tuvastaja';
+$labels['acll'] = 'Ülevaade';
 $labels['aclr'] = 'Lugeda kirju';
+$labels['acls'] = 'Hoia nähtud olekut';
+$labels['aclw'] = 'Salvesta lipud';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
@@ -33,11 +38,13 @@ $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
+$labels['acln'] = 'Annoteeri kirja';
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
+$labels['shortacll'] = 'Ülevaade';
 $labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
 $labels['shortaclw'] = 'Kirjuta';
@@ -50,20 +57,33 @@ $labels['shortaclt'] = 'Kustuta';
 $labels['shortacle'] = 'Eemalda';
 $labels['shortaclx'] = 'Kausta kustutamine';
 $labels['shortacla'] = 'Administreerida';
+$labels['shortacln'] = 'Annoteeri';
 $labels['shortaclother'] = 'Muu';
 $labels['shortaclread'] = 'Loe';
 $labels['shortaclwrite'] = 'Kirjuta';
 $labels['shortacldelete'] = 'Kustuta';
 $labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
+$labels['longacls'] = 'Kirja loetuse lippu saab muuta';
+$labels['longaclw'] = 'Kirja lippe ja otsingusõnu saab muuta, väljaarvatud loetud ja kustutatud';
+$labels['longacli'] = 'Kirju saab salvestada ja kopeerida antud kausta';
+$labels['longaclp'] = 'Kirju saab postitada antud kausta';
+$labels['longaclc'] = 'Kaustasi saab luua (või ümber nimetada) otse siia kausta alla.';
+$labels['longaclk'] = 'Kaustu saab luua (või ümber nimetada) otse siia kausta alla';
 $labels['longacld'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longaclt'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longacle'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
 $labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
+$labels['longacln'] = 'Kirja jagatud metainfot (annotatsioonid) saab muuta';
 $labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
 $labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$labels['longaclwrite'] = 'Kirju saab märgistada, salvestada või kopeerida kausta';
 $labels['longacldelete'] = 'Kirju saab kustutada';
+$labels['longaclother'] = 'Muud ligipääsu õigused';
+$labels['ariasummaryacltable'] = 'Nimekir ligipääsu õigustest';
+$labels['arialabelaclactions'] = 'Näita tegevusi';
+$labels['arialabelaclform'] = 'Ligipääsu õiguste vorm';
 $messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
 $messages['saving'] = 'Ligipääsuõiguste salvestamine...';
 $messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index eb69eda3a..27510e849 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -21,12 +21,24 @@ $labels['username'] = 'Käyttäjä:';
 $labels['editperms'] = 'Muokkaa oikeuksia';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
+$labels['aclc'] = 'Luo alikansioita';
+$labels['aclk'] = 'Luo alikansioita';
+$labels['acld'] = 'Poista viestejä';
+$labels['aclt'] = 'Poista viestejä';
+$labels['aclx'] = 'Poista kansio';
+$labels['aclfull'] = 'Täydet käyttöoikeudet';
 $labels['aclother'] = 'Muu';
+$labels['aclread'] = 'Luku';
+$labels['aclwrite'] = 'Kirjoitus';
+$labels['acldelete'] = 'Poisto';
 $labels['shortaclc'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
 $labels['shortacld'] = 'Poista';
 $labels['shortaclt'] = 'Poista';
 $labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Luku';
+$labels['shortaclwrite'] = 'Kirjoitus';
+$labels['shortacldelete'] = 'Poisto';
 $labels['longaclr'] = 'Kansion voi avata lukua varten';
 $labels['longaclx'] = 'Kansio voidaan poistaa tai nimetä uudelleen';
 $labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index 36c66cda5..1201c7ea1 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione
 $labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
 $labels['longacldelete'] = 'I messaggi possono essere eliminati';
+$labels['longaclother'] = 'Altri diritti di accesso';
+$labels['ariasummaryacltable'] = 'Elenco dei diritti di accesso';
+$labels['arialabelaclactions'] = 'Lista azioni';
+$labels['arialabelaclform'] = 'Modulo di accesso';
 $messages['deleting'] = 'Sto eliminando i diritti di accesso...';
 $messages['saving'] = 'Sto salvando i diritti di accesso...';
 $messages['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 77f831375..75735dd56 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Controlo total incluindo administração de pastas';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
+$labels['longaclother'] = 'Outros direitos de acesso';
+$labels['ariasummaryacltable'] = 'Lista de direitos de acesso';
+$labels['arialabelaclactions'] = 'Lista de acções';
+$labels['arialabelaclform'] = 'Formulário de direitos de acesso';
 $messages['deleting'] = 'A eliminar permissões de acesso...';
 $messages['saving'] = 'A guardar permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';