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

46 files changed, 2167 insertions, 1133 deletions

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index b6e2c811d..d6934780f 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -302,7 +302,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         li_elements.map(function() {
             val = this.value;
             td = $('td.'+this.id, row);
-            if (td && td.hasClass('enabled'))
+            if (td.length && td.hasClass('enabled'))
                 this.checked = true;
         });
 
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 1952dad49..938287b1a 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -55,7 +55,7 @@ class acl extends rcube_plugin
      */
     function acl_actions()
     {
-        $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
+        $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
 
         // Connect to IMAP
         $this->rc->storage_init();
@@ -85,8 +85,8 @@ class acl extends rcube_plugin
     {
         $this->load_config();
 
-        $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
-        $sid    = get_input_value('_id', RCUBE_INPUT_GPC);
+        $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+        $sid    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $users  = array();
 
         if ($this->init_ldap()) {
@@ -157,12 +157,12 @@ class acl extends rcube_plugin
         // add Info fieldset if it doesn't exist
         if (!isset($args['form']['props']['fieldsets']['info']))
             $args['form']['props']['fieldsets']['info'] = array(
-                'name'  => rcube_label('info'),
+                'name'  => $this->rc->gettext('info'),
                 'content' => array());
 
         // Display folder rights to 'Info' fieldset
         $args['form']['props']['fieldsets']['info']['content']['myrights'] = array(
-            'label' => Q($this->gettext('myrights')),
+            'label' => rcube::Q($this->gettext('myrights')),
             'value' => $this->acl2text($myrights)
         );
 
@@ -186,7 +186,7 @@ class acl extends rcube_plugin
         $this->rc->output->add_label('autocompletechars', 'autocompletemore');
 
         $args['form']['sharing'] = array(
-            'name'    => Q($this->gettext('sharing')),
+            'name'    => rcube::Q($this->gettext('sharing')),
             'content' => $this->rc->output->parse('acl.table', false, false),
         );
 
@@ -233,7 +233,8 @@ class acl extends rcube_plugin
 
         // Advanced rights
         $attrib['id'] = 'advancedrights';
-        foreach ($supported as $idx => $val) {
+        foreach ($supported as $key => $val) {
+            $id = "acl$val";
             $ul .= html::tag('li', null,
                 $input->show('', array(
                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
@@ -392,14 +393,14 @@ class acl extends rcube_plugin
 
             // filter out virtual rights (c or d) the server may return
             $userrights = array_intersect($rights, $supported);
-            $userid = html_identifier($user);
+            $userid = rcube_utils::html_identifier($user);
 
             if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $user = $this->gettext($user);
             }
 
             $table->add_row(array('id' => 'rcmrow'.$userid));
-            $table->add('user', Q($user));
+            $table->add('user', rcube::Q($user));
 
             foreach ($items as $key => $right) {
                 $in = $this->acl_compare($userrights, $right);
@@ -427,10 +428,10 @@ class acl extends rcube_plugin
      */
     private function action_save()
     {
-        $mbox  = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
-        $user  = trim(get_input_value('_user', RCUBE_INPUT_GPC));
-        $acl   = trim(get_input_value('_acl', RCUBE_INPUT_GPC));
-        $oldid = trim(get_input_value('_old', RCUBE_INPUT_GPC));
+        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
+        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
+        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));
 
         $acl   = array_intersect(str_split($acl), $this->rights_supported());
         $users = $oldid ? array($user) : explode(',', $user);
@@ -441,9 +442,9 @@ class acl extends rcube_plugin
             if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $username = $this->gettext($user);
             }
-            else {
+            else if (!empty($user)) {
                 if (!strpos($user, '@') && ($realm = $this->get_realm())) {
-                    $user .= '@' . rcube_idn_to_ascii(preg_replace('/^@/', '', $realm));
+                    $user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
                 }
                 $username = $user;
             }
@@ -452,9 +453,12 @@ class acl extends rcube_plugin
                 continue;
             }
 
+            $user     = $this->mod_login($user);
+            $username = $this->mod_login($username);
+
             if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
                 if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
-                    $ret = array('id' => html_identifier($user),
+                    $ret = array('id' => rcube_utils::html_identifier($user),
                          'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
                     $this->rc->output->command('acl_update', $ret);
                     $result++;
@@ -475,15 +479,15 @@ class acl extends rcube_plugin
      */
     private function action_delete()
     {
-        $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); //UTF7-IMAP
-        $user = trim(get_input_value('_user', RCUBE_INPUT_GPC));
+        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP
+        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
 
         $user = explode(',', $user);
 
         foreach ($user as $u) {
             $u = trim($u);
             if ($this->rc->storage->delete_acl($mbox, $u)) {
-                $this->rc->output->command('acl_remove_row', html_identifier($u));
+                $this->rc->output->command('acl_remove_row', rcube_utils::html_identifier($u));
             }
             else {
                 $error = true;
@@ -507,8 +511,8 @@ class acl extends rcube_plugin
             return;
         }
 
-        $this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
-        $advanced   = trim(get_input_value('_mode', RCUBE_INPUT_GPC));
+        $this->mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+        $advanced   = trim(rcube_utils::get_input_value('_mode', rcube_utils::INPUT_GPC));
         $advanced   = $advanced == 'advanced' ? true : false;
 
         // Save state in user preferences
@@ -543,12 +547,12 @@ class acl extends rcube_plugin
 
         foreach ($supported as $right) {
             if (in_array($right, $rights)) {
-                $list[] = html::tag('li', null, Q($this->gettext('acl' . $right)));
+                $list[] = html::tag('li', null, rcube::Q($this->gettext('acl' . $right)));
             }
         }
 
         if (count($list) == count($supported))
-            return Q($this->gettext('aclfull'));
+            return rcube::Q($this->gettext('aclfull'));
 
         return html::tag('ul', $attrib, implode("\n", $list));
     }
@@ -703,4 +707,23 @@ class acl extends rcube_plugin
 
         return $this->ldap->ready;
     }
+
+    /**
+     * Modify user login according to 'login_lc' setting
+     */
+    protected function mod_login($user)
+    {
+        $login_lc = $this->rc->config->get('login_lc');
+
+        if ($login_lc === true || $login_lc == 2) {
+            $user = mb_strtolower($user);
+        }
+        // lowercase domain name
+        else if ($login_lc && strpos($user, '@')) {
+            list($local, $domain) = explode('@', $user);
+            $user = $local . '@' . mb_strtolower($domain);
+        }
+
+        return $user;
+    }
 }
diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc
index 77d1d9d84..d5543ddaa 100644
--- a/plugins/acl/localization/az_AZ.inc
+++ b/plugins/acl/localization/az_AZ.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Paylaşma';
 $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Giriş hüququ ilə hərəkət...';
 $labels['anyone'] = 'Bütün istifadəçilər (istənilən)';
 $labels['anonymous'] = 'Qonaqlar (anonimlər)';
 $labels['identifier'] = 'İdentifikator';
+
 $labels['acll'] = 'Baxış';
-$labels['shortacll'] = 'Baxış';
 $labels['aclr'] = 'Məktubu oxu';
 $labels['acls'] = 'Oxunulan kimi saxla';
 $labels['aclw'] = 'Yazı bayrağı';
 $labels['acli'] = 'Əlavə et (kopyala)';
 $labels['aclp'] = 'Yazı';
-$labels['shortaclp'] = 'Yazı';
 $labels['aclc'] = 'Qovluqaltı yarat';
 $labels['aclk'] = 'Qovluqaltı yarat';
 $labels['acld'] = 'Məktubu sil';
 $labels['aclt'] = 'Məktubu sil';
 $labels['acle'] = 'Poz';
-$labels['shortacle'] = 'Poz';
 $labels['aclx'] = 'Qovluğu sil';
 $labels['acla'] = 'İdarə';
-$labels['shortacla'] = 'İdarə';
+
 $labels['aclfull'] = 'Tam idarə';
 $labels['aclother'] = 'Digər';
-$labels['shortaclother'] = 'Digər';
 $labels['aclread'] = 'Oxu';
-$labels['shortaclr'] = 'Oxu';
-$labels['shortaclread'] = 'Oxu';
 $labels['aclwrite'] = 'Yaz';
-$labels['shortaclw'] = 'Yaz';
-$labels['shortaclwrite'] = 'Yaz';
 $labels['acldelete'] = 'Sil';
-$labels['shortacld'] = 'Sil';
-$labels['shortaclt'] = 'Sil';
-$labels['shortacldelete'] = 'Sil';
+
+$labels['shortacll'] = 'Baxış';
+$labels['shortaclr'] = 'Oxu';
 $labels['shortacls'] = 'Saxla';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Yerləşdir';
+$labels['shortaclp'] = 'Yazı';
 $labels['shortaclc'] = 'Yarat';
 $labels['shortaclk'] = 'Yarat';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Poz';
 $labels['shortaclx'] = 'Qovluğun silinməsi';
+$labels['shortacla'] = 'İdarə';
+
+$labels['shortaclother'] = 'Digər';
+$labels['shortaclread'] = 'Oxu';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = 'Sil';
+
 $labels['longacll'] = 'Qovluq siyahıda görünür və yazılmağa hazırdır';
 $labels['longaclr'] = 'Bu qovluq oxunmaq üçün açıla bilər';
-$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longacls'] = 'Oxunulan flaqı dəyişdirilə bilər';
 $labels['longaclw'] = 'Oxunulan və silinənlərdən başqa flaqlar və açar sözləri dəyişdirilə bilər';
 $labels['longacli'] = 'Məktub qovluğa yazıla və ya saxlanıla bilər';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Silinən flaqı dəyişdirilə bilər';
 $labels['longacle'] = 'Məktublar pozula bilər';
 $labels['longaclx'] = 'Bu qovluq silinə və ya adı dəyişdirilə bilər';
 $labels['longacla'] = 'Bu qovluğa giriş hüququ dəyişdirilə bilər';
+
 $labels['longaclfull'] = 'Qovluğun idarəsi ilə birlikdə, tam giriş.';
+$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longaclwrite'] = 'Məktubu bu qovluğa qeyd etmək, yazmaq və kopyalamaq olar';
 $labels['longacldelete'] = 'Məktubu silmək olar';
-$labels['deleting'] = 'Giriş hüququnun silinməsi...';
-$labels['saving'] = 'Giriş hüququnun saxlanılması...';
-$labels['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
-$labels['deletesuccess'] = 'Giriş hüququ silindi';
-$labels['createsuccess'] = 'Giriş hüququ əlavə edildi';
-$labels['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
-$labels['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
-$labels['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
-$labels['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
-$labels['norights'] = 'Giriş hüquqları göstərilməyib!';
-$labels['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
 
+$messages['deleting'] = 'Giriş hüququnun silinməsi...';
+$messages['saving'] = 'Giriş hüququnun saxlanılması...';
+$messages['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
+$messages['deletesuccess'] = 'Giriş hüququ silindi';
+$messages['createsuccess'] = 'Giriş hüququ əlavə edildi';
+$messages['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
+$messages['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
+$messages['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
+$messages['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
+$messages['norights'] = 'Giriş hüquqları göstərilməyib!';
+$messages['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
+
+?>
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 90eb254ad..b14db1b67 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Pronađi';
+$labels['shortaclr'] = 'Pročitano';
 $labels['shortacls'] = 'Zadrži';
+$labels['shortaclw'] = 'Piši';
 $labels['shortacli'] = 'Umetni';
+$labels['shortaclp'] = 'Objavi';
 $labels['shortaclc'] = 'Kreiraj';
 $labels['shortaclk'] = 'Kreiraj';
+$labels['shortacld'] = 'Obriši';
+$labels['shortaclt'] = 'Obriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
+$labels['shortacla'] = 'Administracija';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Pročitano';
+$labels['shortaclwrite'] = 'Piši';
+$labels['shortacldelete'] = 'Obriši';
+
 $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';
@@ -72,18 +78,22 @@ $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['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['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!';
 
+$messages['deleting'] = 'Brišem prava pristupa...';
+$messages['saving'] = 'Snimam prava pristupa...';
+$messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
+$messages['deletesuccess'] = 'Prava pristupa su uspješno obrisana';
+$messages['createsuccess'] = 'Prava pristupa su uspješno dodana';
+$messages['updateerror'] = 'Nije moguće ažurirati prava pristupa';
+$messages['deleteerror'] = 'Nije moguće obrisati prava pristupa';
+$messages['createerror'] = 'Nije moguće dodati prava pristupa';
+$messages['deleteconfirm'] = 'Jeste li sigurni da želite ukloniti prava pristupa za odabrane korisnike?';
+$messages['norights'] = 'Niste odabrali prava pristupa!';
+$messages['nouser'] = 'Niste odabrali korisničko ime!';
+
+?>
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index c182736c2..f660b8505 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Cerca';
+$labels['shortaclr'] = 'Lectura';
 $labels['shortacls'] = 'Conserva';
+$labels['shortaclw'] = 'Escriptura';
 $labels['shortacli'] = 'Insereix';
+$labels['shortaclp'] = 'Envia l\'entrada';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
+$labels['shortacld'] = 'Suprimeix';
+$labels['shortaclt'] = 'Suprimeix';
+$labels['shortacle'] = 'Buida';
 $labels['shortaclx'] = 'Suprimeix carpeta';
+$labels['shortacla'] = 'Administra';
+
+$labels['shortaclother'] = 'Un altre';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escriptura';
+$labels['shortacldelete'] = 'Suprimeix';
+
 $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';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Poden ser canviats els missatges amb l\'indicador Suprimi
 $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['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $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';
 
+$messages['deleting'] = 'Suprimint els permisos d\'accés...';
+$messages['saving'] = 'Desant els permisos d\'accés...';
+$messages['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
+$messages['deletesuccess'] = 'Els permisos d\'accés han estat suprimits correctament';
+$messages['createsuccess'] = 'Els permisos d\'accés han afegits suprimits correctament';
+$messages['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'accés';
+$messages['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'accés';
+$messages['createerror'] = 'No s\'ha pogut afegir els permisos d\'accés';
+$messages['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'accés de l\'usuari o usuaris seleccionats?';
+$messages['norights'] = 'No s\'ha especificat cap permís';
+$messages['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
index f3bef5335..acf80aca9 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -2,62 +2,73 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Zbynek Vanzura <heptau@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$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['actions'] = 'Access right actions...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
 $labels['identifier'] = 'Identifikátor';
+
+$labels['acll'] = 'Vyhledat';
 $labels['aclr'] = 'Číst zprávy';
+$labels['acls'] = 'Ponechat stav Přečteno';
 $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['shortacll'] = 'Vyhledat';
+$labels['shortaclr'] = 'Číst';
 $labels['shortacls'] = 'Zachovat';
+$labels['shortaclw'] = 'Zapsat';
 $labels['shortacli'] = 'Vložit';
+$labels['shortaclp'] = 'Odeslat';
 $labels['shortaclc'] = 'Vytvořit';
 $labels['shortaclk'] = 'Vytvořit';
+$labels['shortacld'] = 'Smazat';
+$labels['shortaclt'] = 'Smazat';
+$labels['shortacle'] = 'Vyprázdnit';
 $labels['shortaclx'] = 'Mazat složky';
+$labels['shortacla'] = 'Spravovat';
+
+$labels['shortaclother'] = 'Ostatní';
+$labels['shortaclread'] = 'Číst';
+$labels['shortaclwrite'] = 'Zapsat';
+$labels['shortacldelete'] = 'Smazat';
+
 $labels['longacll'] = 'Složka je viditelná v seznamu a může být přihlášena';
 $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['longaclw'] = 'Značky a klíčová slova u zpráv je možné měnit, kromě příznaku Přečteno a Smazáno';
 $labels['longacli'] = 'Zpŕava může být napsána nebo zkopírována do složky';
 $labels['longaclp'] = 'Zpráva byla odeslána do složky';
 $labels['longaclc'] = 'Složka může být vytvořena (nebo přejmenována) přimo v této složce';
@@ -67,18 +78,22 @@ $labels['longaclt'] = 'Značka o smazání zprávy může být změněna';
 $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['longaclfull'] = 'Plný přístup včetně správy složky';
+$labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longaclwrite'] = 'Zpráva může být označena, napsána nebo zkopírována do složky';
 $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';
 
+$messages['deleting'] = 'Odstraňuji přístupová práva...';
+$messages['saving'] = 'Ukládám přístupová práva...';
+$messages['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
+$messages['deletesuccess'] = 'Přístupová páva byla úspěšně odstraněna';
+$messages['createsuccess'] = 'Přístupová práva byla úspěšně přídána';
+$messages['updateerror'] = 'Nelze upravit přístupová práva';
+$messages['deleteerror'] = 'Nelze odstranit přístupová práva';
+$messages['createerror'] = 'Nelze přidat přístupová práva';
+$messages['deleteconfirm'] = 'Opravdu si přejete odstranit přístupová práva pro vybrané(ho) uživatele?';
+$messages['norights'] = 'Nejsou specifikována žádná práva!';
+$messages['nouser'] = 'Není specifikováno uživatelské jméno';
+
+?>
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 20dd1495b..bf6e870e8 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Rhannu';
 $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Chwilio';
+$labels['shortaclr'] = 'Darllen';
 $labels['shortacls'] = 'Cadw';
+$labels['shortaclw'] = 'Ysgrifennu';
 $labels['shortacli'] = 'Mewnosod';
+$labels['shortaclp'] = 'Postio';
 $labels['shortaclc'] = 'Creu';
 $labels['shortaclk'] = 'Creu';
+$labels['shortacld'] = 'Dileu';
+$labels['shortaclt'] = 'Dileu';
+$labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
+$labels['shortacla'] = 'Gweinyddu';
+
+$labels['shortaclother'] = 'Arall';
+$labels['shortaclread'] = 'Darllen';
+$labels['shortaclwrite'] = 'Ysgrifennu';
+$labels['shortacldelete'] = 'Dileu';
+
 $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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $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!';
 
+$messages['deleting'] = 'Yn dileu hawliau mynediad...';
+$messages['saving'] = 'Yn cadw hawliau mynediad...';
+$messages['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
+$messages['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
+$messages['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
+$messages['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
+$messages['deleteerror'] = 'Methwyd dileu hawliau mynediad';
+$messages['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
+$messages['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
+$messages['norights'] = 'Nid oes hawliau wedi eu nodi!';
+$messages['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
+
+?>
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index d37e7c410..0830ccd99 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Tilgangsrettigheder...';
 $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['shortacll'] = 'Slå op';
+$labels['shortaclr'] = 'Læse';
 $labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skrive';
 $labels['shortacli'] = 'Indsæt';
+$labels['shortaclp'] = 'Send';
 $labels['shortaclc'] = 'Opret';
 $labels['shortaclk'] = 'Opret';
+$labels['shortacld'] = 'Slet';
+$labels['shortaclt'] = 'Slet';
+$labels['shortacle'] = 'Udslet';
 $labels['shortaclx'] = 'Slet mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Andet';
+$labels['shortaclread'] = 'Læse';
+$labels['shortaclwrite'] = 'Skrive';
+$labels['shortacldelete'] = 'Slet';
+
 $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['longaclw'] = 'Beskeders flag og nøgleord kan ændres med undtagelse af Læst og Slettet';
 $labels['longacli'] = 'Beskeder kan blive skrevet eller kopieret til mappen';
@@ -72,18 +78,22 @@ $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';
+
 $labels['longaclfull'] = 'Fuld kontrol inklusiv mappeadministration';
+$labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longaclwrite'] = 'Beskeder kan blive markeret, skrevet eller kopieret til mappen';
 $labels['longacldelete'] = 'Beskeder kan slettes';
-$labels['deleting'] = 'Slette rettigheder...';
-$labels['saving'] = 'Gemme rettigheder...';
-$labels['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
-$labels['deletesuccess'] = 'Sletterettigheder blev ændret';
-$labels['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
-$labels['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
-$labels['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
-$labels['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
-$labels['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
-$labels['norights'] = 'Der er ikke specificeret nogle rettigheder!';
-$labels['nouser'] = 'Der er ikke angiver et brugernavn!';
 
+$messages['deleting'] = 'Slette rettigheder...';
+$messages['saving'] = 'Gemme rettigheder...';
+$messages['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
+$messages['deletesuccess'] = 'Sletterettigheder blev ændret';
+$messages['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
+$messages['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
+$messages['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
+$messages['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
+$messages['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
+$messages['norights'] = 'Der er ikke specificeret nogle rettigheder!';
+$messages['nouser'] = 'Der er ikke angiver et brugernavn!';
+
+?>
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index f90404d19..4f596678c 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Sichtbar';
+$labels['shortaclr'] = 'Lesen';
 $labels['shortacls'] = 'Behalte';
+$labels['shortaclw'] = 'Schreiben';
 $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'] = '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';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
 $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['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 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!';
 
+$messages['deleting'] = 'Zugriffsrechte werden entzogen...';
+$messages['saving'] = 'Zugriffsrechte werden gespeichert...';
+$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
+$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$messages['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugefügt';
+$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, dass 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/de_DE.inc b/plugins/acl/localization/de_DE.inc
index cfb685c73..de8c13a33 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
@@ -23,44 +25,48 @@ $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['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['acle'] = '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['shortacll'] = 'Sichtbar';
+$labels['shortaclr'] = 'Lesen';
 $labels['shortacls'] = 'Lesestatus';
+$labels['shortaclw'] = 'Schreiben';
 $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'] = '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';
@@ -72,18 +78,22 @@ $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
index 201cb3c0b..e1b33fbfc 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Look-up';
+$labels['shortaclr'] = 'Read';
 $labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
 $labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Create';
 $labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = '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';
@@ -72,18 +78,22 @@ $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['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['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!';
 
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$messages['updateerror'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Unable to delete access rights';
+$messages['createerror'] = 'Unable to add access rights';
+$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages['norights'] = 'No rights has been specified!';
+$messages['nouser'] = 'No username has been specified!';
+
+?>
diff --git a/plugins/acl/localization/en_US.inc b/plugins/acl/localization/en_US.inc
index f5b1ae64d..033ac29b2 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?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'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
diff --git a/plugins/acl/localization/eo.inc b/plugins/acl/localization/eo.inc
index b24ebcc9f..ddfacd6f8 100644
--- a/plugins/acl/localization/eo.inc
+++ b/plugins/acl/localization/eo.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
@@ -23,41 +25,75 @@ $labels['actions'] = 'Agoj de atingrajtoj...';
 $labels['anyone'] = 'Ĉiuj uzantoj (iu ajn)';
 $labels['anonymous'] = 'Gasto (sennome)';
 $labels['identifier'] = 'Identigilo';
+
 $labels['acll'] = 'Elserĉo';
-$labels['shortacll'] = 'Elserĉo';
 $labels['aclr'] = 'Legi mesaĝojn';
 $labels['acls'] = 'Manteni legitan staton';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Enmeti (alglui)';
 $labels['aclp'] = 'Afiŝi';
-$labels['shortaclp'] = 'Afiŝi';
 $labels['aclc'] = 'Krei subdosierujojn';
 $labels['aclk'] = 'Krei subdosierujojn';
 $labels['acld'] = 'Forigi mesaĝojn';
 $labels['aclt'] = 'Forigi mesaĝojn';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Forigi dosierujon';
 $labels['acla'] = 'Administri';
-$labels['shortacla'] = 'Administri';
+
 $labels['aclfull'] = 'Plena kontrolo';
 $labels['aclother'] = 'Alia';
-$labels['shortaclother'] = 'Alia';
 $labels['aclread'] = 'Legi';
-$labels['shortaclr'] = 'Legi';
-$labels['shortaclread'] = 'Legi';
 $labels['aclwrite'] = 'Skribi';
-$labels['shortaclw'] = 'Skribi';
-$labels['shortaclwrite'] = 'Skribi';
 $labels['acldelete'] = 'Forigi';
-$labels['shortacld'] = 'Forigi';
-$labels['shortaclt'] = 'Forigi';
-$labels['shortacldelete'] = 'Forigi';
+
+$labels['shortacll'] = 'Elserĉo';
+$labels['shortaclr'] = 'Legi';
 $labels['shortacls'] = 'Manteni';
+$labels['shortaclw'] = 'Skribi';
 $labels['shortacli'] = 'Enmeti';
+$labels['shortaclp'] = 'Afiŝi';
 $labels['shortaclc'] = 'Krei';
 $labels['shortaclk'] = 'Krei';
+$labels['shortacld'] = 'Forigi';
+$labels['shortaclt'] = 'Forigi';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Forigo de dosierujo';
+$labels['shortacla'] = 'Administri';
+
+$labels['shortaclother'] = 'Alia';
+$labels['shortaclread'] = 'Legi';
+$labels['shortaclwrite'] = 'Skribi';
+$labels['shortacldelete'] = 'Forigi';
+
 $labels['longacll'] = 'La dosierujo videblas en listoj kaj oni povas aboni al ĝi';
 $labels['longaclr'] = 'La dosierujo malfermeblas por legado';
-$labels['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['longacls'] = 'Messages Seen flag can be changed';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = 'Mesaĝoj skribeblas aŭ kopieblas en la dosierujo';
 $labels['longaclp'] = 'Mesaĝoj afiŝeblas en ĉi tiu dosierujo';
+$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['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$messages['updateerror'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Unable to delete access rights';
+$messages['createerror'] = 'Unable to add access rights';
+$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages['norights'] = 'No rights has been specified!';
+$messages['nouser'] = 'No username has been specified!';
 
+?>
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
index a95dcc589..62f89dcea 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pompilos <ciordia@gmail.com>                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartir';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Búsqueda';
+$labels['shortaclr'] = 'Leer';
 $labels['shortacls'] = 'Conservar';
+$labels['shortaclw'] = 'Escribir';
 $labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Borrar carpeta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Otro';
+$labels['shortaclread'] = 'Leer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Borrar';
+
 $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';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'No se pueden cambiar los mensajes etiquetados como "Borra
 $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['longaclread'] = 'Se puede abrir la carpeta para leer';
 $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';
 
+$messages['deleting'] = 'Borrando permisos de acceso…';
+$messages['saving'] = 'Guardando permisos de acceso…';
+$messages['updatesuccess'] = 'Se han cambiado los permisos de acceso';
+$messages['deletesuccess'] = 'Se han borrado los permisos de acceso';
+$messages['createsuccess'] = 'Se han añadido los permisos de acceso';
+$messages['updateerror'] = 'No se han podido actualizar los permisos de acceso';
+$messages['deleteerror'] = 'No se han podido borrar los permisos de acceso';
+$messages['createerror'] = 'No se han podido añadir los permisos de acceso';
+$messages['deleteconfirm'] = '¿Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
+$messages['norights'] = 'No se han especificado los permisos de acceso';
+$messages['nouser'] = 'No se ha especificado un nombre de usuario';
+
+?>
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 80aa93593..f89e7d6b7 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -2,57 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
+$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
+$labels['identifier'] = 'Tuvastaja';
+
+$labels['acll'] = 'Lookup';
 $labels['aclr'] = 'Lugeda kirju';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
-$labels['shortaclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
 $labels['aclk'] = 'Luua alamkaustu';
 $labels['acld'] = 'Kustutada kirju';
 $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
-$labels['shortacle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
-$labels['shortacla'] = 'Administreerida';
+
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
-$labels['shortaclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
-$labels['shortaclr'] = 'Loe';
-$labels['shortaclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
-$labels['shortaclw'] = 'Kirjuta';
-$labels['shortaclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
-$labels['shortacld'] = 'Kustuta';
-$labels['shortaclt'] = 'Kustuta';
-$labels['shortacldelete'] = 'Kustuta';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
+$labels['shortaclw'] = 'Kirjuta';
 $labels['shortacli'] = 'Lisa';
+$labels['shortaclp'] = 'Postita';
 $labels['shortaclc'] = 'Loo';
 $labels['shortaclk'] = 'Loo';
+$labels['shortacld'] = 'Kustuta';
+$labels['shortaclt'] = 'Kustuta';
+$labels['shortacle'] = 'Eemalda';
+$labels['shortaclx'] = 'Kausta kustutamine';
+$labels['shortacla'] = 'Administreerida';
+
+$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['longaclread'] = 'Kausta saab lugemiseks avada';
+$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'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
-$labels['norights'] = 'Õigusi pole määratud!';
-$labels['nouser'] = 'Kasutajanime pole määratud!';
+$labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
+
+$labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
+$labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Kirju saab kustutada';
+
+$messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
+$messages['saving'] = 'Ligipääsuõiguste salvestamine...';
+$messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';
+$messages['deletesuccess'] = 'Ligipääsuõigused on kustutatud';
+$messages['createsuccess'] = 'Ligipääsuõigused on lisatud';
+$messages['updateerror'] = 'Ligipääsuõiguste uuendamine nurjus';
+$messages['deleteerror'] = 'Ligipääsuõiguste kustutamine nurjus';
+$messages['createerror'] = 'Ligipääsuõiguste andmine nurjus';
+$messages['deleteconfirm'] = 'Oled sa kindel, et sa soovid valitudkasutaja(te) õiguseid kustutada?';
+$messages['norights'] = 'Õigusi pole määratud!';
+$messages['nouser'] = 'Kasutajanime pole määratud!';
 
+?>
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index db2c496eb..48fb8a225 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'اشتراک‌گذاری';
 $labels['myrights'] = 'مجوزهای دسترسی';
 $labels['username'] = 'کاربر:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'یافتن';
+$labels['shortaclr'] = 'خوانده شده';
 $labels['shortacls'] = 'نگه داشتن';
+$labels['shortaclw'] = 'نوشتن';
 $labels['shortacli'] = 'جاگذارى';
+$labels['shortaclp'] = 'نوشته';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
+$labels['shortacld'] = 'حذف';
+$labels['shortaclt'] = 'حذف';
+$labels['shortacle'] = 'پاک کردن';
 $labels['shortaclx'] = 'حذف کردن پوشه';
+$labels['shortacla'] = 'مدیر';
+
+$labels['shortaclother'] = 'دیگر';
+$labels['shortaclread'] = 'خوانده شده';
+$labels['shortaclwrite'] = 'نوشتن';
+$labels['shortacldelete'] = 'حذف';
+
 $labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک به';
 $labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
-$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف';
 $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغ�
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
 $labels['longacla'] = 'قوانین دسترسی پوشه می‌تواند تغییر داده شود';
+
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
+$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $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'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 
+$messages['deleting'] = 'حذف کردن قوانین دسترسی...';
+$messages['saving'] = 'ذخیره قوانین دسترسی...';
+$messages['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
+$messages['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
+$messages['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
+$messages['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
+$messages['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
+$messages['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
+$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$messages['norights'] = 'هیچ قانونی مشخص نشده است!';
+$messages['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
+
+?>
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index 7af5b3e26..e2b6899fa 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -2,60 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Jakaminen';
 $labels['myrights'] = 'Käyttöoikeudet';
 $labels['username'] = 'Käyttäjä:';
 $labels['advanced'] = 'edistynyt tila';
+$labels['newuser'] = 'Add entry';
+$labels['actions'] = 'Access right actions...';
 $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['identifier'] = 'Identifier';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Create subfolders';
+$labels['aclk'] = 'Create subfolders';
+$labels['acld'] = 'Delete messages';
+$labels['aclt'] = 'Delete messages';
+$labels['acle'] = 'Expunge';
+$labels['aclx'] = 'Delete folder';
+$labels['acla'] = 'Administer';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
 $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!';
+$labels['shortacld'] = 'Poista';
+$labels['shortaclt'] = 'Poista';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longaclr'] = '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['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';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$messages['updateerror'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Unable to delete access rights';
+$messages['createerror'] = 'Unable to add access rights';
+$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages['norights'] = 'No rights has been specified!';
+$messages['nouser'] = 'No username has been specified!';
 
+?>
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index e4239dc46..4ac90b6d2 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tr4sK                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partage';
 $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Consultation';
+$labels['shortaclr'] = 'Lecture';
 $labels['shortacls'] = 'Conserver';
+$labels['shortaclw'] = 'Écriture';
 $labels['shortacli'] = 'Insérer';
+$labels['shortaclp'] = 'Envoyer';
 $labels['shortaclc'] = 'Créer';
 $labels['shortaclk'] = 'Créer';
+$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['shortacle'] = 'Purger';
 $labels['shortaclx'] = 'Supprimer un dossier';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Autre';
+$labels['shortaclread'] = 'Lecture';
+$labels['shortaclwrite'] = 'Écriture';
+$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+
 $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';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'L\'étiquette de suppression des messages peut-être modi
 $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['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
 $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é !';
 
+$messages['deleting'] = 'Suppression des droits d\'accès…';
+$messages['saving'] = 'Sauvegarde des droits d\'accès…';
+$messages['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
+$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
+$messages['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
+$messages['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
+$messages['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
+$messages['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié !';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
+
+?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index cf1d80c45..a287a413e 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Dereitos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,10 +25,75 @@ $labels['actions'] = 'Accións sobre os dereitos de acceso...';
 $labels['anyone'] = 'Tódolos usuarios (calquera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
+
+$labels['acll'] = 'Lookup';
 $labels['aclr'] = 'Ler mensaxes';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Create subfolders';
+$labels['aclk'] = 'Create subfolders';
 $labels['acld'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administrar';
 
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longaclr'] = '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['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';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$messages['updateerror'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Unable to delete access rights';
+$messages['createerror'] = 'Unable to add access rights';
+$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages['norights'] = 'No rights has been specified!';
+$messages['nouser'] = 'No username has been specified!';
+
+?>
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 83b3f8292..d7b027a40 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'שיתוף';
 $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'חיפוש';
+$labels['shortaclr'] = 'קריאה';
 $labels['shortacls'] = 'להשאיר';
+$labels['shortaclw'] = 'כתיבה';
 $labels['shortacli'] = 'הוספה בין ערכים';
+$labels['shortaclp'] = 'פרסום';
 $labels['shortaclc'] = 'יצירה';
 $labels['shortaclk'] = 'יצירה';
+$labels['shortacld'] = 'מחיקה';
+$labels['shortaclt'] = 'מחיקה';
+$labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['shortaclx'] = 'מחיקת תיקיה';
+$labels['shortacla'] = 'מנהל';
+
+$labels['shortaclother'] = 'אחר';
+$labels['shortaclread'] = 'קריאה';
+$labels['shortaclwrite'] = 'כתיבה';
+$labels['shortacldelete'] = 'מחיקה';
+
 $labels['longacll'] = 'התיקיה תראה ברשימות וניתן יהיה להרשם אליה';
 $labels['longaclr'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
-$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longacls'] = 'ניתן לשנות דגל נראה בהודעות';
 $labels['longaclw'] = 'ניתן לשנות דגלים ומילות מפתח בהודעות, למעט נראה ונמחק';
 $labels['longacli'] = 'ניתן לכתוב הודעות לתיקיה או למוחקן';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'ניתן לשנות דגל נמחק של הודעות';
 $labels['longacle'] = 'ניתן לנקות הודעות שסומנו כמבוטלות';
 $labels['longaclx'] = 'ניתן למחוק תיקיה זו או לשנות שמה';
 $labels['longacla'] = 'ניתן לשנות זכויות גישה של תיקיה זו';
+
 $labels['longaclfull'] = 'שליטה מלאה כולל ניהול התיקיה';
+$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $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'] = 'לא צוין שם משתמש כלשהו!';
 
+$messages['deleting'] = 'זכויות גישה נמחקות...';
+$messages['saving'] = 'זכויות גישה נשמרות...';
+$messages['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
+$messages['deletesuccess'] = 'זכויות גישה נמחקו בהצלחה';
+$messages['createsuccess'] = 'זכויות גישה נוספו בהצלחה';
+$messages['updateerror'] = 'לא ניתן לעדכן זכויות גישה';
+$messages['deleteerror'] = 'לא ניתן למחוק זכויות גישה';
+$messages['createerror'] = 'לא ניתן להוסיף זכויות גישה';
+$messages['deleteconfirm'] = 'האם ודאי שברצונך להסיר זכויות גישה של המשתמש(ים) שנבחרו?';
+$messages['norights'] = 'לא צוינו זכויות גישה כלשהן !';
+$messages['nouser'] = 'לא צוין שם משתמש כלשהו!';
+
+?>
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index f5ca78fe4..adc6ad8b3 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Keresés';
+$labels['shortaclr'] = 'Olvasás';
 $labels['shortacls'] = 'Megtartás';
+$labels['shortaclw'] = 'Írás';
 $labels['shortacli'] = 'Beszúrás';
+$labels['shortaclp'] = 'Bejegyzés';
 $labels['shortaclc'] = 'Létrehozás';
 $labels['shortaclk'] = 'Létrehozás';
+$labels['shortacld'] = 'Törlés';
+$labels['shortaclt'] = 'Törlés';
+$labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['shortaclx'] = 'Mappa törlése';
+$labels['shortacla'] = 'Adminisztrátor';
+
+$labels['shortaclother'] = 'Egyéb';
+$labels['shortaclread'] = 'Olvasás';
+$labels['shortaclwrite'] = 'Írás';
+$labels['shortacldelete'] = 'Törlés';
+
 $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.';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'A mappa olvasásra megnyitható';
 $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.';
 
+$messages['deleting'] = 'Hozzáférési jogok törlése...';
+$messages['saving'] = 'Hozzáférési jogok mentése...';
+$messages['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';
+$messages['deletesuccess'] = 'A hozzáférési jogok törlése sikeresen megtörtént.';
+$messages['createsuccess'] = 'A hozzáférési jogok hozzáadása sikeresen megtörtént.';
+$messages['updateerror'] = 'Nem sikerült módosítani a hozzáférési jogokat.';
+$messages['deleteerror'] = 'Nem sikerült törölni a hozzáférési jogokat.';
+$messages['createerror'] = 'Nem sikerült a hozzáférési jogok hozzáadása';
+$messages['deleteconfirm'] = 'Biztosan eltávolítja a kiválasztott felhasználó(k) hozzáférési jogait?';
+$messages['norights'] = 'Nincsennek jogok megadva.';
+$messages['nouser'] = 'A felhasználónév nincs megadva.';
+
+?>
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
index 86292984a..d39c19a46 100644
--- a/plugins/acl/localization/hy_AM.inc
+++ b/plugins/acl/localization/hy_AM.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Կիսվել';
 $labels['myrights'] = 'Մուտքի իրավունքներ';
 $labels['username'] = 'Օգտատեր`';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Փնտրում';
+$labels['shortaclr'] = 'Կարդալ';
 $labels['shortacls'] = 'Պահել';
+$labels['shortaclw'] = 'Գրել';
 $labels['shortacli'] = 'Ներդնել';
+$labels['shortaclp'] = 'Հրապարակել';
 $labels['shortaclc'] = 'Ստեղծել';
 $labels['shortaclk'] = 'Ստեղծել';
+$labels['shortacld'] = 'Ջնջել';
+$labels['shortaclt'] = 'Ջնջել';
+$labels['shortacle'] = 'Հեռացնել';
 $labels['shortaclx'] = 'Պանակի ջնջում';
+$labels['shortacla'] = 'Կառավարել';
+
+$labels['shortaclother'] = 'Այլ';
+$labels['shortaclread'] = 'Կարդալ';
+$labels['shortaclwrite'] = 'Գրել';
+$labels['shortacldelete'] = 'Ջնջել';
+
 $labels['longacll'] = 'Պանակը երևում է ցուցակներում և նրան հնարավոր է բաժանորդագրվել';
 $labels['longaclr'] = 'Պանակը կարող է բացվել ընթերցման համար';
-$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $labels['longacls'] = 'Տեսված հաղորդագրությունների նշումը կարող է փոփոխվել';
 $labels['longaclw'] = 'Հաղորդագրությունների նշումները և հիմնաբառերը կարող են փոփոխվել, բացառությամբ Տեսած և Ջնջված նշումների';
 $labels['longacli'] = 'Հաղորդագրությունները կարող են գրվել և պատճենվել պանակի մեջ';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Հաղորդագրությունների Ջնջել նշ�
 $labels['longacle'] = 'Հաղորդագրությունները կարող են հեռացվել';
 $labels['longaclx'] = 'Պանակը կարող է ջնջվել կամ վերանվանվել';
 $labels['longacla'] = 'Պանակի մուտքի իրավունքները կարող են փոփոխվել';
+
 $labels['longaclfull'] = 'Լրիվ վերահսկում ներառյալ պանակների կառավարումը';
+$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $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'] = 'Օգտվողի անունը չի՛ նշվել։';
 
+$messages['deleting'] = 'Ջնջվում են մուտքի իրավունքները…';
+$messages['saving'] = 'Պահպանվում են մուտքի իրավունքները…';
+$messages['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
+$messages['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
+$messages['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
+$messages['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
+$messages['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
+$messages['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
+$messages['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
+$messages['norights'] = 'Ոչ մի իրավունք չի՛ նշվել։';
+$messages['nouser'] = 'Օգտվողի անունը չի՛ նշվել։';
+
+?>
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
new file mode 100644
index 000000000..8e8afc0b8
--- /dev/null
+++ b/plugins/acl/localization/id_ID.inc
@@ -0,0 +1,99 @@
+<?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'] = 'Berbagi';
+$labels['myrights'] = 'Hak Akses';
+$labels['username'] = 'Pengguna:';
+$labels['advanced'] = 'mode canggih';
+$labels['newuser'] = 'Tambahkan entri';
+$labels['actions'] = 'Aksi hak akses...';
+$labels['anyone'] = 'Semua pengguna (siapa saja)';
+$labels['anonymous'] = 'Para tamu (anonim)';
+$labels['identifier'] = 'Yang mengidentifikasi';
+
+$labels['acll'] = 'Cari';
+$labels['aclr'] = 'Baca pesan';
+$labels['acls'] = 'Jaga status terbaca';
+$labels['aclw'] = 'Membuat tanda';
+$labels['acli'] = 'Sisipkan (Salin kedalam)';
+$labels['aclp'] = 'Tulisan';
+$labels['aclc'] = 'Buat subfolder';
+$labels['aclk'] = 'Buat subfolder';
+$labels['acld'] = 'Hapus pesan';
+$labels['aclt'] = 'Hapus pesan';
+$labels['acle'] = 'Menghapus';
+$labels['aclx'] = 'Hapus folder';
+$labels['acla'] = 'Kelola';
+
+$labels['aclfull'] = 'Kendali penuh';
+$labels['aclother'] = 'Lainnya';
+$labels['aclread'] = 'Baca';
+$labels['aclwrite'] = 'Tulis';
+$labels['acldelete'] = 'Hapus';
+
+$labels['shortacll'] = 'Cari';
+$labels['shortaclr'] = 'Baca';
+$labels['shortacls'] = 'Simpan';
+$labels['shortaclw'] = 'Tulis';
+$labels['shortacli'] = 'Sisipkan';
+$labels['shortaclp'] = 'Tulisan';
+$labels['shortaclc'] = 'Buat';
+$labels['shortaclk'] = 'Buat';
+$labels['shortacld'] = 'Hapus';
+$labels['shortaclt'] = 'Hapus';
+$labels['shortacle'] = 'Buang';
+$labels['shortaclx'] = 'Hapus folder';
+$labels['shortacla'] = 'Kelola';
+
+$labels['shortaclother'] = 'Lainnya';
+$labels['shortaclread'] = 'Baca';
+$labels['shortaclwrite'] = 'Tulis';
+$labels['shortacldelete'] = 'Hapus';
+
+$labels['longacll'] = 'Folder terlihat di daftar dan dapat dijadikan langganan';
+$labels['longaclr'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longacls'] = 'Tanda pesan terbaca dapat diubah';
+$labels['longaclw'] = 'Tanda pesan dan kata kunci dapat diubah, kecuali Terbaca dan Terhapus';
+$labels['longacli'] = 'Pesan dapat ditulis atau disalin kedalam folder';
+$labels['longaclp'] = 'Pesan dapat dikirim ke folder ini';
+$labels['longaclc'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longaclk'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longacld'] = 'Tanda hapus pesan dapat diubah';
+$labels['longaclt'] = 'Tanda hapus pesan dapat diubah';
+$labels['longacle'] = 'Pesan dapat dibuang';
+$labels['longaclx'] = 'Folder dapat dihapus atau diubah namanya';
+$labels['longacla'] = 'Hak akses folder dapat diubah';
+
+$labels['longaclfull'] = 'Kendali penuh penuh termasuk administrasi';
+$labels['longaclread'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longaclwrite'] = 'Pesan dapat ditandai, ditulis atau disalin kedalam folder';
+$labels['longacldelete'] = 'Pesan dapat dihapus';
+
+$messages['deleting'] = 'Menghapus hak akses...';
+$messages['saving'] = 'Menyimpan hak akses...';
+$messages['updatesuccess'] = 'Hak akses berhasil diubah';
+$messages['deletesuccess'] = 'Hak akses berhasil dihapus';
+$messages['createsuccess'] = 'Hak akses berhasil ditambahkan';
+$messages['updateerror'] = 'Tidak dapat memperbaharui hak akses';
+$messages['deleteerror'] = 'Tidak dapat menghapus hak akses';
+$messages['createerror'] = 'Tidak dapat menambah hak akses';
+$messages['deleteconfirm'] = 'Apakah Anda yakin ingin menghapus hak akses dari user terpilih?';
+$messages['norights'] = 'Hak belum ditentukan!';
+$messages['nouser'] = 'Username belum ditentukan!';
+
+?>
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index ce3751c8b..b4927fb3f 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -2,79 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
 $labels['advanced'] = 'modalità avanzata';
 $labels['newuser'] = 'Aggiungi voce';
+$labels['actions'] = 'Azioni permessi d\'accesso...';
 $labels['anyone'] = 'Tutti gli utenti';
 $labels['anonymous'] = 'Osptiti (anonimi)';
 $labels['identifier'] = 'Identificatore';
+
 $labels['acll'] = 'Ricerca';
-$labels['shortacll'] = 'Ricerca';
 $labels['aclr'] = 'Leggi messaggi';
 $labels['acls'] = 'Mantieni lo stato Visto';
 $labels['aclw'] = 'Flag di scrittura';
 $labels['acli'] = 'Inserisci (Copia in)';
+$labels['aclp'] = 'Invio';
 $labels['aclc'] = 'Crea sottocartelle';
 $labels['aclk'] = 'Crea sottocartelle';
 $labels['acld'] = 'Elimina messaggi';
 $labels['aclt'] = 'Elimina messaggi';
+$labels['acle'] = 'Elimina';
 $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
-$labels['shortacla'] = 'Amministra';
+
 $labels['aclfull'] = 'Controllo completo';
 $labels['aclother'] = 'Altri';
-$labels['shortaclother'] = 'Altri';
 $labels['aclread'] = 'Lettura';
-$labels['shortaclr'] = 'Lettura';
-$labels['shortaclread'] = 'Lettura';
 $labels['aclwrite'] = 'Scrittura';
-$labels['shortaclw'] = 'Scrittura';
-$labels['shortaclwrite'] = 'Scrittura';
 $labels['acldelete'] = 'Elimina';
-$labels['shortacld'] = 'Elimina';
-$labels['shortaclt'] = 'Elimina';
-$labels['shortacldelete'] = 'Elimina';
+
+$labels['shortacll'] = 'Ricerca';
+$labels['shortaclr'] = 'Lettura';
 $labels['shortacls'] = 'Mantieni';
+$labels['shortaclw'] = 'Scrittura';
 $labels['shortacli'] = 'Inserisci';
+$labels['shortaclp'] = 'Invio';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
+$labels['shortacld'] = 'Elimina';
+$labels['shortaclt'] = 'Elimina';
+$labels['shortacle'] = 'Elimina';
 $labels['shortaclx'] = 'Cancella cartella';
+$labels['shortacla'] = 'Amministra';
+
+$labels['shortaclother'] = 'Altri';
+$labels['shortaclread'] = 'Lettura';
+$labels['shortaclwrite'] = 'Scrittura';
+$labels['shortacldelete'] = 'Elimina';
+
 $labels['longacll'] = 'La cartella è visibile sulle liste e può essere sottoscritta';
 $labels['longaclr'] = 'Questa cartella può essere aperta in lettura';
-$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longacls'] = 'Il flag Messaggio Visto può essere cambiato';
 $labels['longaclw'] = 'I flag dei messaggi e le keywords possono essere cambiati, ad esclusione di Visto ed Eliminato';
 $labels['longacli'] = 'I messaggi possono essere scritti o copiati nella cartella';
+$labels['longaclp'] = 'I messaggi possono essere inviati a questa cartella';
+$labels['longaclc'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
+$labels['longaclk'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
 $labels['longacld'] = 'Il flag Messaggio Eliminato può essere cambiato';
 $labels['longaclt'] = 'Il flag Messaggio Eliminato può essere cambiato';
+$labels['longacle'] = 'I messaggi possono essere cancellati';
 $labels['longaclx'] = 'La cartella può essere eliminata o rinominata';
 $labels['longacla'] = 'I diritti di accesso della cartella possono essere cambiati';
+
 $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['deleting'] = 'Sto eliminando i diritti di accesso...';
-$labels['saving'] = 'Sto salvando i diritti di accesso...';
-$labels['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
-$labels['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
-$labels['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
-$labels['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
-$labels['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
-$labels['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
-$labels['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
-$labels['norights'] = 'Nessun diritto specificato!';
-$labels['nouser'] = 'Lo username non è stato specificato!';
 
+$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';
+$messages['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
+$messages['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
+$messages['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
+$messages['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
+$messages['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
+$messages['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
+$messages['norights'] = 'Nessun diritto specificato!';
+$messages['nouser'] = 'Lo username non è stato specificato!';
+
+?>
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 3f915e291..29e96e6fe 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '共有';
 $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
@@ -23,44 +25,48 @@ $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['shortacll'] = '検索';
+$labels['shortaclr'] = '読み込み';
 $labels['shortacls'] = '保持';
+$labels['shortaclw'] = '書き込み';
 $labels['shortacli'] = '挿入';
+$labels['shortaclp'] = '投稿';
 $labels['shortaclc'] = '作成';
 $labels['shortaclk'] = '作成';
+$labels['shortacld'] = '削除';
+$labels['shortaclt'] = '削除';
+$labels['shortacle'] = '抹消';
 $labels['shortaclx'] = 'フォルダーの削除';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = 'その他';
+$labels['shortaclread'] = '読み込み';
+$labels['shortaclwrite'] = '書き込み';
+$labels['shortacldelete'] = '削除';
+
 $labels['longacll'] = 'フォルダーをリストに見えるようにして登録可能:';
 $labels['longaclr'] = 'フォルダーを読むことを可能';
-$labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longacls'] = 'メッセージの既読のフラッグの変更を可能';
 $labels['longaclw'] = '既読と削除のフラッグを除く、メッセージのフラッグとキーワードの変更を可能';
 $labels['longacli'] = 'メッセージに書き込みとフォルダーへの複製を可能';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'メッセージの削除フラッグの変更を可能';
 $labels['longacle'] = 'メッセージの抹消を可能';
 $labels['longaclx'] = 'このフォルダーの削除や名前の変更を可能';
 $labels['longacla'] = 'フォルダーのアクセス権の変更を可能';
+
 $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を可能';
+$labels['longaclread'] = 'フォルダーを読むことを可能';
 $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'] = 'ユーザー名を指定していません!';
 
+$messages['deleting'] = 'アクセス権を削除中...';
+$messages['saving'] = 'アクセス権を保存中...';
+$messages['updatesuccess'] = 'アクセス権を変更しました。';
+$messages['deletesuccess'] = 'アクセス権を削除しました。';
+$messages['createsuccess'] = 'アクセス権を追加しました。';
+$messages['updateerror'] = 'アクセス権を更新できません。';
+$messages['deleteerror'] = 'アクセス権を削除できません。';
+$messages['createerror'] = 'アクセス権を追加できません。';
+$messages['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
+$messages['norights'] = '何の権限も指定されていません!';
+$messages['nouser'] = 'ユーザー名を指定していません!';
+
+?>
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index 54f7d4032..85e33725d 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -2,54 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
+$labels['advanced'] = 'advanced mode';
 $labels['newuser'] = '엔트리 추가';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$labels['anonymous'] = 'Guests (anonymous)';
 $labels['identifier'] = '식별자';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
 $labels['acls'] = '읽은 상태로 유지';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
 $labels['aclp'] = '게시';
-$labels['shortaclp'] = '게시';
 $labels['aclc'] = '하위 폴더 만들기';
 $labels['aclk'] = '하위 폴더 만들기';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = '폴더 삭제';
 $labels['acla'] = '관리자';
-$labels['shortacla'] = '관리자';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = '게시';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = '폴더 삭제';
+$labels['shortacla'] = '관리자';
+
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longaclr'] = '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'] = '폴더에 메시지를 복사하거나 작성할 수 있음';
 $labels['longaclp'] = '이 폴더로 메시지를 게시할 수 있음';
 $labels['longaclc'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longaclk'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longacld'] = '메시지 삭제 플래그가 변경될 수 있음';
 $labels['longaclt'] = '메시지 삭제 플래그가 변경될 수 있음';
+$labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = '폴더를 삭제하거나 이름 변경 할 수 있음';
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
+
 $labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
+$labels['longaclread'] = 'The folder can be opened for reading';
 $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이 없음!';
 
+$messages['deleting'] = '접근 권한 삭제 중...';
+$messages['saving'] = '접근 권한 저장 중...';
+$messages['updatesuccess'] = '접근 권한을 변경하는데 성공 함.';
+$messages['deletesuccess'] = '접근 권한을 삭제하는데 성공 함.';
+$messages['createsuccess'] = '접근 권한을 추가하는데 성공 함.';
+$messages['updateerror'] = '접근 권한을 갱신할 수 없음.';
+$messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
+$messages['createerror'] = '접근 권한을 추가할 수 없음.';
+$messages['deleteconfirm'] = '선택한 사용자(들)의 접근 권한을 삭제하고자 하는 것이 확실 합니까?';
+$messages['norights'] = '지정된 권한이 없음!';
+$messages['nouser'] = '지정된 username이 없음!';
+
+?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index d43dd2e30..6507504e2 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Linvydas Lapinskas <win0lin1@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
 $labels['advanced'] = 'pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
+$labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
 $labels['anonymous'] = 'Svečias (anonimas)';
 $labels['identifier'] = 'Identifikatorius';
+
 $labels['acll'] = 'Paieška';
-$labels['shortacll'] = 'Paieška';
 $labels['aclr'] = 'Perskaityti pranešimus';
+$labels['acls'] = 'Palikti būseną "Žiūrėtas"';
 $labels['aclw'] = 'Įrašyti vėliavėles';
 $labels['acli'] = 'Įterpti (kopijuoti į)';
 $labels['aclp'] = 'Įrašas';
-$labels['shortaclp'] = 'Įrašas';
 $labels['aclc'] = 'Kurti poaplankius';
 $labels['aclk'] = 'Kurti poaplankius';
 $labels['acld'] = 'Ištrinti žinutes';
 $labels['aclt'] = 'Ištrinti žinutes';
+$labels['acle'] = 'Išbraukti';
 $labels['aclx'] = 'Ištrinti aplanką';
+$labels['acla'] = 'Valdyti';
+
+$labels['aclfull'] = 'Visiška kontrolė';
 $labels['aclother'] = 'Kita';
-$labels['shortaclother'] = 'Kita';
 $labels['aclread'] = 'Skaityti';
-$labels['shortaclr'] = 'Skaityti';
-$labels['shortaclread'] = 'Skaityti';
 $labels['aclwrite'] = 'Įrašyti';
-$labels['shortaclw'] = 'Įrašyti';
-$labels['shortaclwrite'] = 'Įrašyti';
 $labels['acldelete'] = 'Trinti';
-$labels['shortacld'] = 'Trinti';
-$labels['shortaclt'] = 'Trinti';
-$labels['shortacldelete'] = 'Trinti';
+
+$labels['shortacll'] = 'Paieška';
+$labels['shortaclr'] = 'Skaityti';
 $labels['shortacls'] = 'Palikti';
+$labels['shortaclw'] = 'Įrašyti';
 $labels['shortacli'] = 'Įterpti';
+$labels['shortaclp'] = 'Įrašas';
 $labels['shortaclc'] = 'Sukurti';
 $labels['shortaclk'] = 'Sukurti';
+$labels['shortacld'] = 'Trinti';
+$labels['shortaclt'] = 'Trinti';
+$labels['shortacle'] = 'Išbraukti';
 $labels['shortaclx'] = 'Ištrinti aplanką';
+$labels['shortacla'] = 'Valdyti';
+
+$labels['shortaclother'] = 'Kita';
+$labels['shortaclread'] = 'Skaityti';
+$labels['shortaclwrite'] = 'Įrašyti';
+$labels['shortacldelete'] = 'Trinti';
+
+$labels['longacll'] = 'Aplankas yra matomas sąrašuose ir gali būti prenumeruojamas';
+$labels['longaclr'] = 'Aplanką galima peržiūrėti';
+$labels['longacls'] = 'Pranešimų vėliavėlė "Matyta" gali būti pakeista';
+$labels['longaclw'] = 'Pranešimų vėliavėlės ir raktažodžiai gali būti pakeisti, išskyrus "Matytas" ir "Ištrintas"';
 $labels['longacli'] = 'Pranešimai gali būti įrašyti arba nukopijuoti į aplanką';
+$labels['longaclp'] = 'Messages can be posted to this folder';
+$labels['longaclc'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
+$labels['longaclk'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
+$labels['longacld'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
+$labels['longaclt'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
 $labels['longacle'] = 'Pranešimai gali būti išbraukti';
 $labels['longaclx'] = 'Aplankas gali būti pašalintas arba pervadintas';
+$labels['longacla'] = 'Aplanko prieigos teisės gali būti pakeistos';
+
 $labels['longaclfull'] = 'Visiška kontrolė įskaitant aplanko administravimą';
+$labels['longaclread'] = 'Aplanką galima peržiūrėti';
 $labels['longaclwrite'] = 'Pranešimai gali būti pažymėti, įrašyti arba nukopijuoti į aplanką';
 $labels['longacldelete'] = 'Pranešimai gali būti ištrinti';
-$labels['deleting'] = 'Panaikinamos prieigos teisės';
-$labels['saving'] = 'Išsaugomos prieigos teisės';
-$labels['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';
-$labels['deletesuccess'] = 'Prieigos teisės sėkmingai panaikintos';
-$labels['createsuccess'] = 'Prieigos teisės sėkmingai pridėtos';
-$labels['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
-$labels['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
-$labels['createerror'] = 'Neišeina pridėti prieigos teises';
 
+$messages['deleting'] = 'Panaikinamos prieigos teisės';
+$messages['saving'] = 'Išsaugomos prieigos teisės';
+$messages['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';
+$messages['deletesuccess'] = 'Prieigos teisės sėkmingai panaikintos';
+$messages['createsuccess'] = 'Prieigos teisės sėkmingai pridėtos';
+$messages['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
+$messages['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
+$messages['createerror'] = 'Neišeina pridėti prieigos teises';
+$messages['deleteconfirm'] = 'Ar jūs esate įsitikinę, jog norite panaikinti prieigos teises pažymėtiems vartotojams(-ui)?';
+$messages['norights'] = 'Nenurodytos jokios teisės!';
+$messages['nouser'] = 'Nenurodytas joks vartotojas!';
+
+?>
diff --git a/plugins/acl/localization/nb_NB.inc b/plugins/acl/localization/nb_NB.inc
deleted file mode 100644
index d7b401b22..000000000
--- a/plugins/acl/localization/nb_NB.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/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 Bore                                                   |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['sharing'] = 'Deling';
-$labels['myrights'] = 'Tilgangsrettigheter';
-$labels['username'] = 'Bruker:';
-$labels['advanced'] = 'Avansert modus';
-$labels['newuser'] = 'Legg til oppføring';
-$labels['anyone'] = 'Alle brukere (alle)';
-$labels['anonymous'] = 'Gjester (anononyme)';
-$labels['identifier'] = 'Identifikator';
-$labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
-$labels['aclr'] = 'Les meldinger';
-$labels['acli'] = 'Lim inn';
-$labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
-$labels['aclc'] = 'Opprett undermapper';
-$labels['aclk'] = 'Opprett undermapper';
-$labels['acld'] = 'Slett meldinger';
-$labels['aclt'] = 'Slett meldinger';
-$labels['acle'] = 'Slett fullstendig';
-$labels['shortacle'] = 'Slett fullstendig';
-$labels['aclx'] = 'Slett mappe';
-$labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
-$labels['aclread'] = 'Les';
-$labels['shortaclr'] = 'Les';
-$labels['shortaclread'] = 'Les';
-$labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
-$labels['acldelete'] = 'Slett';
-$labels['shortacld'] = 'Slett';
-$labels['shortaclt'] = 'Slett';
-$labels['shortacldelete'] = 'Slett';
-$labels['shortacls'] = 'Behold';
-$labels['shortacli'] = 'Sett inn';
-$labels['shortaclc'] = 'Opprett';
-$labels['shortaclk'] = 'Opprett';
-$labels['longacldelete'] = 'Meldingen kan slettes';
-$labels['deleting'] = 'Sletter tilgangsrettigheter';
-$labels['saving'] = 'Lagrer tilgangsrettigheter';
-
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
new file mode 100644
index 000000000..26171578b
--- /dev/null
+++ b/plugins/acl/localization/nb_NO.inc
@@ -0,0 +1,99 @@
+<?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'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettigheter';
+$labels['username'] = 'Bruker:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Valg for tilgangsrettigheter.';
+$labels['anyone'] = 'Alle brukere (alle)';
+$labels['anonymous'] = 'Gjester (anonyme)';
+$labels['identifier'] = 'Identifikator';
+
+$labels['acll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldinger';
+$labels['acls'] = 'Behold lesestatus';
+$labels['aclw'] = 'Lagre flagg';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldinger';
+$labels['aclt'] = 'Slett meldinger';
+$labels['acle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrer';
+
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Annet';
+$labels['aclread'] = 'Les';
+$labels['aclwrite'] = 'Skriv';
+$labels['acldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
+$labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skriv';
+$labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Opprett';
+$labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
+$labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Annet';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
+$labels['longacll'] = 'Mappen er synlig og kan abonneres på';
+$labels['longaclr'] = 'Mappen kan åpnes for lesing';
+$labels['longacls'] = 'Meldingenes lesestatusflagg kan endres';
+$labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endres, bortsett fra status for lesing og sletting';
+$labels['longacli'] = 'Meldinger kan lagres eller kopieres til mappen';
+$labels['longaclp'] = 'Meldinger kan postes til denne mappen';
+$labels['longaclc'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longaclk'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longacld'] = 'Meldingenes flagg for sletting kan endres';
+$labels['longaclt'] = 'Meldingenes flagg for sletting kan endres';
+$labels['longacle'] = 'Meldingen kan slettes for godt';
+$labels['longaclx'] = 'Mappen kan slettes eller gis nytt navn';
+$labels['longacla'] = 'Mappens tilgangsrettigheter kan endres';
+
+$labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappen kan åpnes for lesing';
+$labels['longaclwrite'] = 'Meldinger kan merkes, lagres i eller flyttes til mappen';
+$labels['longacldelete'] = 'Meldingen kan slettes';
+
+$messages['deleting'] = 'Sletter tilgangsrettigheter';
+$messages['saving'] = 'Lagrer tilgangsrettigheter';
+$messages['updatesuccess'] = 'Tilgangsrettigheter ble endret';
+$messages['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
+$messages['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
+$messages['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
+$messages['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
+$messages['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
+$messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
+$messages['norights'] = 'Ingen rettigheter er spesifisert!';
+$messages['nouser'] = 'Brukernavn er ikke spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 68dcc7f96..b5ca0c3d8 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
@@ -23,44 +25,48 @@ $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['acli'] = 'Invoegen (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['shortacll'] = 'Opzoeken';
+$labels['shortaclr'] = 'Lezen';
 $labels['shortacls'] = 'Behouden';
+$labels['shortaclw'] = 'Schrijven';
 $labels['shortacli'] = 'Invoegen';
+$labels['shortaclp'] = 'Plaatsen';
 $labels['shortaclc'] = 'Aanmaken';
 $labels['shortaclk'] = 'Aanmaken';
+$labels['shortacld'] = 'Verwijderen';
+$labels['shortaclt'] = 'Verwijderen';
+$labels['shortacle'] = 'Vernietigen';
 $labels['shortaclx'] = 'Map verwijderen';
+$labels['shortacla'] = 'Beheren';
+
+$labels['shortaclother'] = 'Overig';
+$labels['shortaclread'] = 'Lezen';
+$labels['shortaclwrite'] = 'Schrijven';
+$labels['shortacldelete'] = '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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'De map kan geopend worden om te lezen';
 $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!';
 
+$messages['deleting'] = 'Toegangsrechten worden verwijderd...';
+$messages['saving'] = 'Toegangsrechten worden opgeslagen...';
+$messages['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
+$messages['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
+$messages['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
+$messages['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
+$messages['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
+$messages['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
+$messages['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
+$messages['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
+$messages['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
+
+?>
diff --git a/plugins/acl/localization/nn_NO.inc b/plugins/acl/localization/nn_NO.inc
new file mode 100644
index 000000000..743d2c8b8
--- /dev/null
+++ b/plugins/acl/localization/nn_NO.inc
@@ -0,0 +1,99 @@
+<?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'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettar';
+$labels['username'] = 'Brukar:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Val for tilgangsrettar...';
+$labels['anyone'] = 'Alle brukarar (alle)';
+$labels['anonymous'] = 'Gjester (anonyme)';
+$labels['identifier'] = 'Identifikator';
+
+$labels['acll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldingar';
+$labels['acls'] = 'Behald lesestatus';
+$labels['aclw'] = 'Skriveflagg';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldingar';
+$labels['aclt'] = 'Slett meldingar';
+$labels['acle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrér';
+
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Anna';
+$labels['aclread'] = 'Les';
+$labels['aclwrite'] = 'Skriv';
+$labels['acldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
+$labels['shortacls'] = 'Behald';
+$labels['shortaclw'] = 'Skriv';
+$labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Opprett';
+$labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
+$labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrér';
+
+$labels['shortaclother'] = 'Anna';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
+$labels['longacll'] = 'Mappa er synleg og kan abonnerast på';
+$labels['longaclr'] = 'Mappa kan opnast for lesing';
+$labels['longacls'] = 'Meldingane sine lesestatusflagg kan endrast';
+$labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endrast, bortsett frå status for lesing og sletting';
+$labels['longacli'] = 'Meldingar kan lagrast eller kopierast til mappa';
+$labels['longaclp'] = 'Meldingar kan postast til denne mappa';
+$labels['longaclc'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longaclk'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longacld'] = 'Meldingane sine flagg for sletting kan endrast';
+$labels['longaclt'] = 'Meldingane sine flagg for sletting kan endrast';
+$labels['longacle'] = 'Meldinga kan slettast for godt';
+$labels['longaclx'] = 'Mappa kan slettast eller få nytt namn';
+$labels['longacla'] = 'Mappa sine tilgangsrettar kan endrast';
+
+$labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappa kan opnast for lesing';
+$labels['longaclwrite'] = 'Meldingar kan merkast, lagrast i eller flyttast til mappa';
+$labels['longacldelete'] = 'Meldinga kan slettast';
+
+$messages['deleting'] = 'Slettar tilgangsrettar…';
+$messages['saving'] = 'Lagrar tilgangsrettar…';
+$messages['updatesuccess'] = 'Tilgangsrettiar vart endra';
+$messages['deletesuccess'] = 'Tilgangsretter vart sletta';
+$messages['createsuccess'] = 'Tilgangsrettar vart legne til';
+$messages['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
+$messages['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
+$messages['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
+$messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valde brukarar?';
+$messages['norights'] = 'Ingen rettar er spesifisert!';
+$messages['nouser'] = 'Brukarnamn er ikkje spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index b8007f025..73c0fc4fb 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Goście (anonymous)';
 $labels['identifier'] = 'Identyfikator';
+
 $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';
-$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';
-$labels['shortacle'] = 'Porządkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja';
-$labels['shortacla'] = 'Administracja';
+
 $labels['aclfull'] = 'Wszystkie';
 $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['shortacld'] = 'Usuwanie';
-$labels['shortaclt'] = 'Usuwanie';
-$labels['shortacldelete'] = 'Usuwanie';
+
+$labels['shortacll'] = 'Podgląd';
+$labels['shortaclr'] = 'Odczyt';
 $labels['shortacls'] = 'Zmiana';
+$labels['shortaclw'] = 'Zapis';
 $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'] = '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['longacli'] = 'Pozwala zapisywać wiadomości i kopiować do folderu';
@@ -72,18 +78,22 @@ $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
index 2e4828304..eaf042110 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Salvar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Excluir';
+$labels['shortaclt'] = 'Excluir';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Excluir pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Salvar';
+$labels['shortacldelete'] = 'Excluir';
+
 $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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'A pasta pode ser aberta para leitura';
 $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!';
 
+$messages['deleting'] = 'Apagando permissões de acesso...';
+$messages['saving'] = 'Salvando permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso apagadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível atualizar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível apagar as permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteconfirm'] = 'Tem certeza que deseja remover as permissões de acesso do(s) usuário(s) delecionado(s)?';
+$messages['norights'] = 'Não foram definidas permissões!';
+$messages['nouser'] = 'Nome de usuário não especificado!';
+
+?>
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 72c595afa..9a2e9a320 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partilhar';
 $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Guardar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
+$labels['shortacle'] = 'Eliminar';
 $labels['shortaclx'] = 'Eliminar pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Guardar';
+$labels['shortacldelete'] = 'Eliminar';
+
 $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';
@@ -72,18 +78,22 @@ $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['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['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!';
 
+$messages['deleting'] = 'A eliminar as permissões de acesso...';
+$messages['saving'] = 'A guardar as permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível actualizar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
+$messages['norights'] = 'Não foram especificadas quaisquer permissões!';
+$messages['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
+
+?>
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index 5d51f392c..e87524a6c 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -2,51 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
+$labels['sharing'] = 'Partajare';
+$labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
 $labels['advanced'] = 'mod avansat';
 $labels['newuser'] = 'Adăugare intrare';
+$labels['actions'] = 'Acțiunea drepturilor de acces...';
+$labels['anyone'] = 'Toți utilizatori (oricare)';
 $labels['anonymous'] = 'Vizitator';
 $labels['identifier'] = 'Identificator';
+
 $labels['acll'] = 'Caută';
-$labels['shortacll'] = 'Caută';
 $labels['aclr'] = 'Citire mesaje';
+$labels['acls'] = 'Menține starea de Vâzut';
+$labels['aclw'] = 'Indicator scriere';
+$labels['acli'] = 'Inserare (copiere în)';
 $labels['aclp'] = 'Postează';
-$labels['shortaclp'] = 'Postează';
 $labels['aclc'] = 'Creează subdirectoare';
 $labels['aclk'] = 'Creează subdirectoare';
 $labels['acld'] = 'Ștergere mesaje';
 $labels['aclt'] = 'Ștergere mesaje';
 $labels['acle'] = 'Elimină';
-$labels['shortacle'] = 'Elimină';
 $labels['aclx'] = 'Ștergere dosar';
 $labels['acla'] = 'Administrează';
-$labels['shortacla'] = 'Administrează';
+
+$labels['aclfull'] = 'Control complet';
 $labels['aclother'] = 'Altul';
-$labels['shortaclother'] = 'Altul';
 $labels['aclread'] = 'Citeşte';
-$labels['shortaclr'] = 'Citeşte';
-$labels['shortaclread'] = 'Citeşte';
 $labels['aclwrite'] = 'Scrie';
-$labels['shortaclw'] = 'Scrie';
-$labels['shortaclwrite'] = 'Scrie';
 $labels['acldelete'] = 'Șterge';
-$labels['shortacld'] = 'Șterge';
-$labels['shortaclt'] = 'Șterge';
-$labels['shortacldelete'] = 'Șterge';
+
+$labels['shortacll'] = 'Caută';
+$labels['shortaclr'] = 'Citeşte';
 $labels['shortacls'] = 'Păstrează';
+$labels['shortaclw'] = 'Scrie';
 $labels['shortacli'] = 'Inserează';
+$labels['shortaclp'] = 'Postează';
 $labels['shortaclc'] = 'Creează';
 $labels['shortaclk'] = 'Creează';
+$labels['shortacld'] = 'Șterge';
+$labels['shortaclt'] = 'Șterge';
+$labels['shortacle'] = 'Elimină';
+$labels['shortaclx'] = 'Ștergere dosar';
+$labels['shortacla'] = 'Administrează';
+
+$labels['shortaclother'] = 'Altul';
+$labels['shortaclread'] = 'Citeşte';
+$labels['shortaclwrite'] = 'Scrie';
+$labels['shortacldelete'] = 'Șterge';
+
+$labels['longacll'] = 'Dosarul este vizibil pe liste și se poate înscrie pe el';
+$labels['longaclr'] = 'Dosarul se poate deschide pentru citire';
+$labels['longacls'] = 'Indicatorul de Văzut a fost schimbat';
+$labels['longaclw'] = 'Indicatoarele și cuvintele cheie ale mesajelor se pot schimba cu excepția Văzut și Șters';
+$labels['longacli'] = 'Mesajul se poate scrie sau copia într-un dosar';
+$labels['longaclp'] = 'Mesajele se pot trimite către acest dosar';
+$labels['longaclc'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
+$labels['longaclk'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
+$labels['longacld'] = 'Indicatorul de Șters al mesajelor se pot modifica';
+$labels['longaclt'] = 'Indicatorul de Șters al mesajelor se pot modifica';
+$labels['longacle'] = 'Mesajele se pot elimina';
+$labels['longaclx'] = 'Dosarul se poate șterge sau redenumi';
+$labels['longacla'] = 'Drepturile de acces la dosar se pot schimba';
+
+$labels['longaclfull'] = 'Control complet include și administrare dosar';
+$labels['longaclread'] = 'Dosarul se poate deschide pentru citire';
+$labels['longaclwrite'] = 'Mesajul se poate marca, scrie sau copia într-un dosar';
+$labels['longacldelete'] = 'Mesajul se poate șterge';
+
+$messages['deleting'] = 'Drepturile de acces la ștergere...';
+$messages['saving'] = 'Drepturile de acces la salvare...';
+$messages['updatesuccess'] = 'Drepturile de acces au fost schimbate cu succes';
+$messages['deletesuccess'] = 'Drepturile de acces au fost șterse cu succes';
+$messages['createsuccess'] = 'Drepturile de acces au fost adăugate cu succes';
+$messages['updateerror'] = 'Nu sau putut actualiza drepturile de acces';
+$messages['deleteerror'] = 'Nu sau putut șterge drepturile de acces';
+$messages['createerror'] = 'Nu sau putut adăuga drepturi de acces';
+$messages['deleteconfirm'] = 'Sunteți sigur că doriți să ștergeți drepturile de acces la utilizatorul(i) selectați?';
+$messages['norights'] = 'Nu au fost specificate drepturi!';
+$messages['nouser'] = 'Nu a fost specificat nume de utilizator!';
 
+?>
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index f50610a03..93eb9eff2 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Совместный доступ';
 $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Поиск';
+$labels['shortaclr'] = 'Чтение';
 $labels['shortacls'] = 'Оставить';
+$labels['shortaclw'] = 'Запись';
 $labels['shortacli'] = 'Вставить';
+$labels['shortaclp'] = 'Отправить';
 $labels['shortaclc'] = 'Создать';
 $labels['shortaclk'] = 'Создать';
+$labels['shortacld'] = 'Удаление';
+$labels['shortaclt'] = 'Удаление';
+$labels['shortacle'] = 'Уничтожить сообщения';
 $labels['shortaclx'] = 'Удаление папки';
+$labels['shortacla'] = 'Администрировать';
+
+$labels['shortaclother'] = 'Другое';
+$labels['shortaclread'] = 'Чтение';
+$labels['shortaclwrite'] = 'Запись';
+$labels['shortacldelete'] = 'Удаление';
+
 $labels['longacll'] = 'Папка видима в списках и доступна для подписки';
 $labels['longaclr'] = 'Эта папка может быть открыта для чтения';
-$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longacls'] = 'Флаг Прочитано может быть изменен';
 $labels['longaclw'] = 'Флаги и ключевые слова, кроме Прочитано и Удалено, могут быть изменены';
 $labels['longacli'] = 'Сообщения могут быть записаны или скопированы в папку';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Флаг Удалено может быть измене�
 $labels['longacle'] = 'Сообщения могут быть уничтожены';
 $labels['longaclx'] = 'Эта папка может быть переименована или удалена';
 $labels['longacla'] = 'Права доступа к папке могут быть изменены';
+
 $labels['longaclfull'] = 'Полный доступ, включая управление папкой';
+$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $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'] = 'Не определено имя пользователя!';
 
+$messages['deleting'] = 'Удаление прав доступа...';
+$messages['saving'] = 'Сохранение прав доступа...';
+$messages['updatesuccess'] = 'Права доступа успешно изменены';
+$messages['deletesuccess'] = 'Права доступа успешно удалены';
+$messages['createsuccess'] = 'Успешно добавлены права доступа';
+$messages['updateerror'] = 'Невозможно обновить права доступа';
+$messages['deleteerror'] = 'Невозможно удалить права доступа';
+$messages['createerror'] = 'Невозможно добавить права доступа';
+$messages['deleteconfirm'] = 'Вы уверены в том, что хотите удалить права доступа выбранных пользователей?';
+$messages['norights'] = 'Права доступа не установлены!';
+$messages['nouser'] = 'Не определено имя пользователя!';
+
+?>
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index 7bd702a52..64b146cfc 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové práva';
 $labels['username'] = 'Používateľ:';
@@ -23,42 +25,48 @@ $labels['actions'] = 'Prístupové práva činností...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
 $labels['anonymous'] = 'Hostia (anonymne)';
 $labels['identifier'] = 'Identifikátor';
+
 $labels['acll'] = 'Vyhľadať';
-$labels['shortacll'] = 'Vyhľadať';
 $labels['aclr'] = 'Čítať správy';
 $labels['acls'] = 'Ponechať ako prečítané';
 $labels['aclw'] = 'Príznaky na zapisovanie';
 $labels['acli'] = 'Vložiť (Skopírovať do)';
+$labels['aclp'] = 'Post';
 $labels['aclc'] = 'Vytvoriť podpriečinky';
 $labels['aclk'] = 'Vytvoriť podpriečinky';
 $labels['acld'] = 'Zmazať správy';
 $labels['aclt'] = 'Zmazať správy';
 $labels['acle'] = 'Vyčistiť';
-$labels['shortacle'] = 'Vyčistiť';
 $labels['aclx'] = 'Zmazať priečinok';
 $labels['acla'] = 'Spravovať';
-$labels['shortacla'] = 'Spravovať';
+
 $labels['aclfull'] = 'Plný prístup';
 $labels['aclother'] = 'Ostatné';
-$labels['shortaclother'] = 'Ostatné';
 $labels['aclread'] = 'Čítanie';
-$labels['shortaclr'] = 'Čítanie';
-$labels['shortaclread'] = 'Čítanie';
 $labels['aclwrite'] = 'Zápis';
-$labels['shortaclw'] = 'Zápis';
-$labels['shortaclwrite'] = 'Zápis';
 $labels['acldelete'] = 'Odstrániť';
-$labels['shortacld'] = 'Odstrániť';
-$labels['shortaclt'] = 'Odstrániť';
-$labels['shortacldelete'] = 'Odstrániť';
+
+$labels['shortacll'] = 'Vyhľadať';
+$labels['shortaclr'] = 'Čítanie';
 $labels['shortacls'] = 'Ponechať';
+$labels['shortaclw'] = 'Zápis';
 $labels['shortacli'] = 'Vložiť';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Vytvoriť';
 $labels['shortaclk'] = 'Vytvoriť';
+$labels['shortacld'] = 'Odstrániť';
+$labels['shortaclt'] = 'Odstrániť';
+$labels['shortacle'] = 'Vyčistiť';
 $labels['shortaclx'] = 'Odstrániť priečinok';
+$labels['shortacla'] = 'Spravovať';
+
+$labels['shortaclother'] = 'Ostatné';
+$labels['shortaclread'] = 'Čítanie';
+$labels['shortaclwrite'] = 'Zápis';
+$labels['shortacldelete'] = 'Odstrániť';
+
 $labels['longacll'] = 'Priečinok je v zoznamoch viditeľný a dá sa doň zapísať';
 $labels['longaclr'] = 'Prečinok je možné otvoriť na čítanie';
-$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longacls'] = 'Príznak "Prečítané" je možné zmeniť';
 $labels['longaclw'] = 'Príznaky správ a kľúčové slová je možné zmeniť, okrem "Prečítané" a "Vymazané';
 $labels['longacli'] = 'Do tohto priečinka je možné zapisovať alebo kopírovať správy';
@@ -70,18 +78,22 @@ $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longacle'] = 'Správy je možné vymazať';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
 $labels['longacla'] = 'Je možné zmeniť prístupové práva k priečinku';
+
 $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
+$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
 $labels['longacldelete'] = 'Správy je možné vymazať';
-$labels['deleting'] = 'Odstraňovanie prístupových práv...';
-$labels['saving'] = 'Ukladanie prístupových práv...';
-$labels['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
-$labels['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
-$labels['createsuccess'] = 'Prístupové práva boli úspešne pridané';
-$labels['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
-$labels['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
-$labels['createerror'] = 'Prístupové práva sa nepodarilo pridať';
-$labels['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
-$labels['norights'] = 'Neboli určené žiadne práva!';
-$labels['nouser'] = 'Nebolo určené žiadne meno používateľa!';
 
+$messages['deleting'] = 'Odstraňovanie prístupových práv...';
+$messages['saving'] = 'Ukladanie prístupových práv...';
+$messages['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
+$messages['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
+$messages['createsuccess'] = 'Prístupové práva boli úspešne pridané';
+$messages['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
+$messages['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
+$messages['createerror'] = 'Prístupové práva sa nepodarilo pridať';
+$messages['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
+$messages['norights'] = 'Neboli určené žiadne práva!';
+$messages['nouser'] = 'Nebolo určené žiadne meno používateľa!';
+
+?>
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
index e644c9d14..8c8a552a7 100644
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Skupna raba';
 $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Iskanje';
+$labels['shortaclr'] = 'Preberi';
 $labels['shortacls'] = 'Ohrani';
+$labels['shortaclw'] = 'Sestavi';
 $labels['shortacli'] = 'Vstavi';
+$labels['shortaclp'] = 'Objava';
 $labels['shortaclc'] = 'Ustvari';
 $labels['shortaclk'] = 'Ustvari';
+$labels['shortacld'] = 'Izbriši';
+$labels['shortaclt'] = 'Izbriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Izbriši mapo';
+$labels['shortacla'] = 'Uredi';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Preberi';
+$labels['shortaclwrite'] = 'Sestavi';
+$labels['shortacldelete'] = 'Izbriši';
+
 $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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'Mapa je na voljo za branje';
 $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';
 
+$messages['deleting'] = 'Brisanje pravic';
+$messages['saving'] = 'Shranjevanje pravic';
+$messages['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
+$messages['deletesuccess'] = 'Pravice so bile uspešno izbrisane';
+$messages['createsuccess'] = 'Pravice so bile uspešno dodane';
+$messages['updateerror'] = 'Pravic ni mogoče posodobiti';
+$messages['deleteerror'] = 'Pravic ni mogoče izbrisati';
+$messages['createerror'] = 'Pravic ni bilo mogoče dodati';
+$messages['deleteconfirm'] = 'Ste prepričani, da želite odstraniti pravice dostopa za izbrane uporabnike?';
+$messages['norights'] = 'Pravic niste določili';
+$messages['nouser'] = 'Niste določili uporabnišlega imena';
+
+?>
diff --git a/plugins/acl/localization/sr_CS.inc b/plugins/acl/localization/sr_CS.inc
new file mode 100644
index 000000000..19f744066
--- /dev/null
+++ b/plugins/acl/localization/sr_CS.inc
@@ -0,0 +1,99 @@
+<?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'] = 'Дељење';
+$labels['myrights'] = 'Права приступа';
+$labels['username'] = 'Корисник:';
+$labels['advanced'] = 'advanced mode';
+$labels['newuser'] = 'Додај унос';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$labels['anonymous'] = 'Guests (anonymous)';
+$labels['identifier'] = 'Identifier';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Create subfolders';
+$labels['aclk'] = 'Create subfolders';
+$labels['acld'] = 'Delete messages';
+$labels['aclt'] = 'Delete messages';
+$labels['acle'] = 'Expunge';
+$labels['aclx'] = 'Delete folder';
+$labels['acla'] = 'Administer';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longaclr'] = '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['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';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$messages['updateerror'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Unable to delete access rights';
+$messages['createerror'] = 'Unable to add access rights';
+$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages['norights'] = 'No rights has been specified!';
+$messages['nouser'] = 'No username has been specified!';
+
+?>
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
index a2f41dcaa..6c68080de 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Uppslagning';
+$labels['shortaclr'] = 'Läs';
 $labels['shortacls'] = 'Behåll';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Infoga';
+$labels['shortaclp'] = 'Posta';
 $labels['shortaclc'] = 'Skapa';
 $labels['shortaclk'] = 'Skapa';
+$labels['shortacld'] = 'Ta bort';
+$labels['shortaclt'] = 'Ta bort';
+$labels['shortacle'] = 'Utplåna';
 $labels['shortaclx'] = 'Ta bort katalog';
+$labels['shortacla'] = 'Administrera';
+
+$labels['shortaclother'] = 'Övrig';
+$labels['shortaclread'] = 'Läs';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Ta bort';
+
 $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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'Katalogen kan öppnas för läsning';
 $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!';
 
+$messages['deleting'] = 'Tar bort åtkomsträttigheter...';
+$messages['saving'] = 'Sparar åtkomsträttigheter...';
+$messages['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
+$messages['deletesuccess'] = 'Åtkomsträttigheterna är borttagna';
+$messages['createsuccess'] = 'Åtkomsträttigheterna är tillagda';
+$messages['updateerror'] = 'Åtkomsträttigheterna kunde inte ändras';
+$messages['deleteerror'] = 'Åtkomsträttigheterna kunde inte tas bort';
+$messages['createerror'] = 'Åtkomsträttigheterna kunde inte läggas till';
+$messages['deleteconfirm'] = 'Vill du verkligen ta bort åtkomsträttigheterna för markerade användare?';
+$messages['norights'] = 'Inga åtkomsträttigheter angavs!';
+$messages['nouser'] = 'Inget användarnamn angavs!';
+
+?>
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 509effaad..1569b5926 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
@@ -23,44 +25,48 @@ $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['shortacll'] = 'Arama';
+$labels['shortaclr'] = 'Oku';
 $labels['shortacls'] = 'Koru';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Ekle';
+$labels['shortaclp'] = 'Gönder';
 $labels['shortaclc'] = 'Oluştur';
 $labels['shortaclk'] = 'Oluştur';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Sil';
 $labels['shortaclx'] = 'Dizin sil';
+$labels['shortacla'] = 'Yönet';
+
+$labels['shortaclother'] = 'Diğer';
+$labels['shortaclread'] = 'Oku';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = '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';
@@ -72,18 +78,22 @@ $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['longaclread'] = 'Dizin yazma için okunabilir';
 $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ş!';
 
+$messages['deleting'] = 'Erişim hakları siliniyor...';
+$messages['saving'] = 'Erişim hakları saklanıyor...';
+$messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
+$messages['deletesuccess'] = 'Erişim hakları başarıyla silindi';
+$messages['createsuccess'] = 'Erişim hakları başarıyla eklendi';
+$messages['updateerror'] = 'Erişim haklarını güncellenemedi';
+$messages['deleteerror'] = 'Erişim haklarını silinemedi';
+$messages['createerror'] = 'Erişim hakları eklenemedi';
+$messages['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
+$messages['norights'] = 'Hiçbir hak belirtilmemiş!';
+$messages['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
+
+?>
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index 65dc96dd3..1a6ea58e7 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Cách ứng xử quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
 $labels['anonymous'] = 'Khách (nặc danh)';
 $labels['identifier'] = 'Định danh';
+
 $labels['acll'] = 'Tìm kiếm';
-$labels['shortacll'] = 'Tìm kiếm';
 $labels['aclr'] = 'Đọc thư';
 $labels['acls'] = 'Giữ trạng thái đã xem qua';
 $labels['aclw'] = 'Cờ đánh dấu cho mục viết';
 $labels['acli'] = 'Chèn thêm (sao chép vào)';
 $labels['aclp'] = 'Đăng bài';
-$labels['shortaclp'] = 'Đăng bài';
 $labels['aclc'] = 'Tạo giữ liệu con';
 $labels['aclk'] = 'Tạo giữ liệu con';
 $labels['acld'] = 'Xóa thư';
 $labels['aclt'] = 'Xóa thư';
 $labels['acle'] = 'Thải bỏ';
-$labels['shortacle'] = 'Thải bỏ';
 $labels['aclx'] = 'Xóa giữ liệu';
 $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['shortacll'] = 'Tìm kiếm';
+$labels['shortaclr'] = 'Đọc';
 $labels['shortacls'] = 'Giữ';
+$labels['shortaclw'] = 'Viết';
 $labels['shortacli'] = 'Chèn';
+$labels['shortaclp'] = 'Đăng bài';
 $labels['shortaclc'] = 'Tạo mới';
 $labels['shortaclk'] = 'Tạo mới';
+$labels['shortacld'] = 'Xoá';
+$labels['shortaclt'] = 'Xoá';
+$labels['shortacle'] = 'Thải bỏ';
 $labels['shortaclx'] = 'Giữ liệu được xóa';
+$labels['shortacla'] = 'Quản lý';
+
+$labels['shortaclother'] = 'Loại khác';
+$labels['shortaclread'] = 'Đọc';
+$labels['shortaclwrite'] = 'Viết';
+$labels['shortacldelete'] = 'Xoá';
+
 $labels['longacll'] = 'Giữ liệu đã được liệt kê và có thể đóng góp';
 $labels['longaclr'] = 'Giữ liệu có thể được mở để đọc';
-$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longacls'] = 'Cờ đánh dấu thư đã xem qua có thể thay đổi';
 $labels['longaclw'] = 'Cờ thư và từ khóa có thể thay đổi, ngoại trừ đã xem qua và bị xóa';
 $labels['longacli'] = 'Thư có thể được ghi hoặc sao chép vào giữ liệu';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
 $labels['longacle'] = 'Thư có thể thải bỏ';
 $labels['longaclx'] = 'Giữ liệu có thể xóa được hoặc đặt lại tên';
 $labels['longacla'] = 'Quyên truy cập giữ liệu có thể thay đổi';
+
 $labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả sự thi hành giữ liệu';
+$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép vào giữ liệu';
 $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['updateerror'] = 'Không thể cập nhật quyền truy cập';
-$labels['deleteerror'] = 'Khôngthể xóa quyền truy cập';
-$labels['createerror'] = 'Không thể thêm 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?';
-$labels['norights'] = 'Chưa có quyền nào được chỉ định!';
-$labels['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
 
+$messages['deleting'] = 'Xóa quyền truy cập...';
+$messages['saving'] = 'Lưu quyền truy cập...';
+$messages['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
+$messages['deletesuccess'] = 'Xóa quyền truy cập thành công...';
+$messages['createsuccess'] = 'Thêm quyền truy cập thành công...';
+$messages['updateerror'] = 'Không thể cập nhật quyền truy cập';
+$messages['deleteerror'] = 'Khôngthể xóa quyền truy cập';
+$messages['createerror'] = 'Không thể thêm quyền truy cập';
+$messages['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?';
+$messages['norights'] = 'Chưa có quyền nào được chỉ định!';
+$messages['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
+
+?>
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 3cde07aa8..0c5171664 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: WeiHua.Deng <mcp2000@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '共享中';
 $labels['myrights'] = '访问权限';
-$labels['username'] = '用户名：';
+$labels['username'] = '用户：';
 $labels['advanced'] = '高级模式';
 $labels['newuser'] = '添加条目';
+$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '来宾(匿名)';
 $labels['identifier'] = '标识符';
+
 $labels['acll'] = '查找';
-$labels['shortacll'] = '查找';
 $labels['aclr'] = '读取消息';
 $labels['acls'] = '保存已读状态';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = '插入(复制至)';
 $labels['aclp'] = '发送';
-$labels['shortaclp'] = '发送';
 $labels['aclc'] = '创建子文件夹';
 $labels['aclk'] = '创建子文件夹';
 $labels['acld'] = '删除消息';
 $labels['aclt'] = '删除消息';
+$labels['acle'] = '清除';
 $labels['aclx'] = '删除文件夹';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
+
+$labels['aclfull'] = '全部控制';
 $labels['aclother'] = '其他';
-$labels['shortaclother'] = '其他';
+$labels['aclread'] = '阅读';
 $labels['aclwrite'] = '撰写';
-$labels['shortaclw'] = '撰写';
-$labels['shortaclwrite'] = '撰写';
 $labels['acldelete'] = '删除';
-$labels['shortacld'] = '删除';
-$labels['shortaclt'] = '删除';
-$labels['shortacldelete'] = '删除';
+
+$labels['shortacll'] = '查找';
+$labels['shortaclr'] = '阅读';
 $labels['shortacls'] = '保留';
+$labels['shortaclw'] = '撰写';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '发送';
 $labels['shortaclc'] = '新建';
 $labels['shortaclk'] = '新建';
+$labels['shortacld'] = '删除';
+$labels['shortaclt'] = '删除';
+$labels['shortacle'] = '清除';
 $labels['shortaclx'] = '删除文件夹';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = '其他';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = '撰写';
+$labels['shortacldelete'] = '删除';
+
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
-$labels['longaclread'] = '该文件夹可被打开阅读';
+$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'] = '消息可被清除';
 $labels['longaclx'] = '该文件夹可悲删除或重命名';
-$labels['deleting'] = '删除访问权限中…';
-$labels['saving'] = '保存访问权限中…';
-$labels['updatesuccess'] = '成功修改访问权限';
-$labels['deletesuccess'] = '成功删除访问权限';
-$labels['createsuccess'] = '成功添加访问权限';
-$labels['updateerror'] = '无法更新访问权限';
-$labels['deleteerror'] = '无法删除访问权限';
-$labels['createerror'] = '无法添加访问权限';
-$labels['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
-$labels['norights'] = '没有已指定的权限!';
-$labels['nouser'] = '没有已指定的用户名!';
+$labels['longacla'] = '文件夹访问权限可被修改';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = '该文件夹可被打开阅读';
+$labels['longaclwrite'] = '消息可被标记，撰写或复制至文件夹中';
+$labels['longacldelete'] = '信息可被删除';
+
+$messages['deleting'] = '删除访问权限中…';
+$messages['saving'] = '保存访问权限中…';
+$messages['updatesuccess'] = '成功修改访问权限';
+$messages['deletesuccess'] = '成功删除访问权限';
+$messages['createsuccess'] = '成功添加访问权限';
+$messages['updateerror'] = '无法更新访问权限';
+$messages['deleteerror'] = '无法删除访问权限';
+$messages['createerror'] = '无法添加访问权限';
+$messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
+$messages['norights'] = '没有已指定的权限!';
+$messages['nouser'] = '没有已指定的用户名!';
 
+?>
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index f04e0b9a2..3125c286f 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者：';
@@ -23,44 +25,50 @@ $labels['actions'] = '權限設定';
 $labels['anyone'] = '所有使用者 (anyone)';
 $labels['anonymous'] = '訪客 (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['shortacll'] = '尋找';
+$labels['shortaclr'] = '讀取';
 $labels['shortacls'] = '保存';
+$labels['shortaclw'] = '寫入';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '發表';
 $labels['shortaclc'] = '建立';
 $labels['shortaclk'] = '建立';
+$labels['shortacld'] = '刪除';
+$labels['shortaclt'] = '刪除';
+$labels['shortacle'] = '刪去';
 $labels['shortaclx'] = '資料夾刪除';
+$labels['shortacla'] = '管理者';
+
+$labels['shortaclother'] = '其它';
+$labels['shortaclread'] = '讀取';
+$labels['shortaclwrite'] = '寫入';
+$labels['shortacldelete'] = '刪除';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
 $labels['longaclr'] = '資料夾能被打開與讀取';
-$labels['longaclread'] = '資料夾能被打開與讀取';
 $labels['longacls'] = '能修改訊息標幟';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = '訊息能寫入或複製到資料夾';
 $labels['longaclp'] = '訊息能被投遞到這個資料夾';
 $labels['longaclc'] = '這個資料夾之下可以建子資料夾(或重新命名）';
@@ -70,18 +78,22 @@ $labels['longaclt'] = '能修改訊息刪除標幟';
 $labels['longacle'] = '能抹除訊息';
 $labels['longaclx'] = '資料夾能被刪除或重新命名';
 $labels['longacla'] = '能變更資料夾權限';
+
 $labels['longaclfull'] = '完全控制包含資料夾管理';
+$labels['longaclread'] = '資料夾能被打開與讀取';
 $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'] = '沒有指定用戶名稱';
 
+$messages['deleting'] = '刪除權限...';
+$messages['saving'] = '儲存權限...';
+$messages['updatesuccess'] = '權限變更完成';
+$messages['deletesuccess'] = '權限刪除完成';
+$messages['createsuccess'] = '權限新增完成';
+$messages['updateerror'] = '無法更新權限';
+$messages['deleteerror'] = '無法刪除權限';
+$messages['createerror'] = '無法新增權限';
+$messages['deleteconfirm'] = '您確定要刪除所選取使用者的權限嗎?';
+$messages['norights'] = '沒有指定任何權限';
+$messages['nouser'] = '沒有指定用戶名稱';
+
+?>
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index e5d411e18..52e234f37 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -13,9 +13,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-06-28</date>
+	<date>2013-03-01</date>
 	<version>
-		<release>1.0</release>
+		<release>1.2</release>
 		<api>0.7</api>
 	</version>
 	<stability>
diff --git a/plugins/acl/tests/Acl.php b/plugins/acl/tests/Acl.php
new file mode 100644
index 000000000..e752ac977
--- /dev/null
+++ b/plugins/acl/tests/Acl.php
@@ -0,0 +1,23 @@
+<?php
+
+class Acl_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../acl.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new acl($rcube->api);
+
+        $this->assertInstanceOf('acl', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+