Fix bug in remote content blocking on HTML image and style tags (#6178)

Conflicts:
	CHANGELOG
	program/steps/mail/sendmail.inc

.htaccess

@@ -10,6 +10,7 @@ php_value	upload_max_filesize	5M
 php_value	post_max_size		6M
 php_value	memory_limit		64M
 
+php_flag	register_globals	Off
 php_flag	zlib.output_compression		Off
 php_flag	magic_quotes_gpc		Off
 php_flag	magic_quotes_runtime		Off
@@ -30,7 +31,7 @@ RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 # security rules:
 # - deny access to files not containing a dot or starting with a dot
 #   in all locations except installer directory
-RewriteRule ^(?!installer)(\.?[^\.]+)$ - [F]
+RewriteRule ^(?!installer|\.well-known\/)(\.?[^\.]+)$ - [F]
 # - deny access to some locations
 RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]
 # - deny access to some documentation files

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = be: be_BE, sr: sr_CS, fa: fa_AF, lb: lb_LU
+lang_map = be: be_BE, sr: sr_CS, fa: fa_AF, lb: lb_LU, fr: fr_FR
 type = PHP_ALT_ARRAY
 
 [roundcube-webmail.labels]

INSTALL

@@ -14,12 +14,11 @@ REQUIREMENTS
 * PHP Version 5.2.1 or greater including
    - PCRE, DOM, JSON, XML, Session, Sockets (required)
    - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
-     Note: MySQL database driver requires PHP 5.3 or newer.
+     Note: MySQL database driver requires PHP 5.3.7 or newer.
    - Libiconv, Zip (recommended)
    - Fileinfo, Mcrypt, mbstring (optional)
 * PEAR packages distributed with Roundcube or external:
    - Mail_Mime 1.8.1 or newer
-   - Mail_mimeDecode 1.5.5 or newer
    - Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
    - Net_IDNA2 0.1.1 or newer
    - Auth_SASL 1.0.6 or newer
@@ -35,6 +34,7 @@ REQUIREMENTS
    - mbstring.func_overload disabled
    - magic_quotes_runtime disabled
    - magic_quotes_sybase disabled
+   - register_globals disabled (PHP < 5.4)
 * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker
 * A MySQL (4.0.8 or newer), PostgreSQL, MS SQL Server (2005 or newer) database engine
   or SQLite support in PHP

README.md

@@ -3,14 +3,6 @@ Roundcube Webmail
 [roundcube.net](http://roundcube.net)
 
 
-ATTENTION
----------
-This is just a snapshot from the GIT repository and is **NOT A STABLE
-version of Roundcube**. It's not recommended to replace an existing installation
-of Roundcube with this version. Also using a separate database for this
-installation is highly recommended.
-
-
 INTRODUCTION
 ------------
 Roundcube Webmail is a browser-based multilingual IMAP client with an
@@ -80,8 +72,8 @@ For more information visit [roundcube.net/contribute][contrib]
 
 CONTACT
 -------
-For any bug reports or feature requests please refer to the tracking system
-at [trac.roundcube.net][tracreport] or subscribe to our mailing list.
+For bug reports or feature requests please refer to the tracking system
+at [Github][githubissues] or subscribe to our mailing list.
 See [roundcube.net/support][support] for details.
 
 You're always welcome to send a message to the project admin:
@@ -98,4 +90,4 @@ hello(at)roundcube(dot)net
 [license]:      http://roundcube.net/license
 [contrib]:      http://roundcube.net/contribute
 [support]:      http://roundcube.net/support
-[tracreport]:   http://trac.roundcube.net/wiki/Howto_ReportIssues
+[githubissues]: https://github.com/roundcube/roundcubemail/issues

SQL/mssql.initial.sql

@@ -155,42 +155,42 @@ ALTER TABLE [dbo].[contacts] WITH NOCHECK ADD
 	CONSTRAINT [PK_contacts_contact_id] PRIMARY KEY  CLUSTERED 
 	(
 		[contact_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD 
 	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED 
 	(
 		[contactgroup_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD 
 	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED 
 	(
 		[contactgroup_id], [contact_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[identities] WITH NOCHECK ADD 
 	 PRIMARY KEY  CLUSTERED 
 	(
 		[identity_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[session] WITH NOCHECK ADD 
 	CONSTRAINT [PK_session_sess_id] PRIMARY KEY  CLUSTERED 
 	(
 		[sess_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[users] WITH NOCHECK ADD 
 	CONSTRAINT [PK_users_user_id] PRIMARY KEY  CLUSTERED 
 	(
 		[user_id]
-	)  ON [PRIMARY] 
+	) ON [PRIMARY] 
 GO
 
 ALTER TABLE [dbo].[searches] WITH NOCHECK ADD 
@@ -225,22 +225,22 @@ ALTER TABLE [dbo].[cache_messages] ADD
 	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
 GO
 
-CREATE  INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]
+CREATE INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY]
+CREATE INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
 GO
 
 CREATE INDEX [IX_cache_expires] ON [dbo].[cache]([expires]) ON [PRIMARY]
@@ -269,7 +269,7 @@ ALTER TABLE [dbo].[contacts] ADD
 	CONSTRAINT [CK_contacts_del] CHECK ([del] = '1' or [del] = '0')
 GO
 
-CREATE  INDEX [IX_contacts_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_contacts_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[contactgroups] ADD 
@@ -280,7 +280,7 @@ ALTER TABLE [dbo].[contactgroups] ADD
 	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')
 GO
 
-CREATE  INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_contactgroups_user_id] ON [dbo].[contactgroups]([user_id]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[contactgroupmembers] ADD 
@@ -289,7 +289,7 @@ ALTER TABLE [dbo].[contactgroupmembers] ADD
 	CONSTRAINT [DF_contactgroupmembers_created] DEFAULT (getdate()) FOR [created]
 GO
 
-CREATE  INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
+CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[identities] ADD 
@@ -302,13 +302,13 @@ ALTER TABLE [dbo].[identities] ADD
 	CONSTRAINT [DF_identities_reply] DEFAULT ('') FOR [reply-to],
 	CONSTRAINT [DF_identities_bcc] DEFAULT ('') FOR [bcc],
 	CONSTRAINT [DF_identities_html_signature] DEFAULT ('0') FOR [html_signature],
-	 CHECK ([standard] = '1' or [standard] = '0'),
-	 CHECK ([del] = '1' or [del] = '0')
+	CHECK ([standard] = '1' or [standard] = '0'),
+	CHECK ([del] = '1' or [del] = '0')
 GO
 
-CREATE  INDEX [IX_identities_user_id] ON [dbo].[identities]([user_id]) ON [PRIMARY]
+CREATE INDEX [IX_identities_user_id] ON [dbo].[identities]([user_id]) ON [PRIMARY]
 GO
-CREATE  INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
+CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[session] ADD 
@@ -317,7 +317,7 @@ ALTER TABLE [dbo].[session] ADD
 	CONSTRAINT [DF_session_ip] DEFAULT ('') FOR [ip]
 GO
 
-CREATE  INDEX [IX_session_changed] ON [dbo].[session]([changed]) ON [PRIMARY]
+CREATE INDEX [IX_session_changed] ON [dbo].[session]([changed]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[users] ADD 
@@ -326,10 +326,10 @@ ALTER TABLE [dbo].[users] ADD
 	CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created]
 GO
 
-CREATE  UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]
+CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]
 GO
 
-CREATE  UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]
+CREATE UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]
 GO
 
 ALTER TABLE [dbo].[searches] ADD 
@@ -393,6 +393,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
 GO
 
-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013061000')
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2014042900')
 GO
 

SQL/mssql/2013061000.sql

@@ -1,12 +1,12 @@
-ALTER TABLE [dbo].[cache] ADD COLUMN [expires] [datetime] NULL
+ALTER TABLE [dbo].[cache] ADD [expires] [datetime] NULL
 GO
-ALTER TABLE [dbo].[cache_shared] ADD COLUMN [expires] [datetime] NULL
+ALTER TABLE [dbo].[cache_shared] ADD [expires] [datetime] NULL
 GO
-ALTER TABLE [dbo].[cache_index] ADD COLUMN [expires] [datetime] NULL
+ALTER TABLE [dbo].[cache_index] ADD [expires] [datetime] NULL
 GO
-ALTER TABLE [dbo].[cache_thread] ADD COLUMN [expires] [datetime] NULL
+ALTER TABLE [dbo].[cache_thread] ADD [expires] [datetime] NULL
 GO
-ALTER TABLE [dbo].[cache_messages] ADD COLUMN [expires] [datetime] NULL
+ALTER TABLE [dbo].[cache_messages] ADD [expires] [datetime] NULL
 GO
 
 UPDATE [dbo].[cache] SET [expires] = DATEADD(second, 604800, [created])

SQL/mssql/2014042900.sql

@@ -0,0 +1 @@
+-- empty

SQL/mysql.initial.sql

@@ -25,7 +25,7 @@ CREATE TABLE `users` (
  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
  `last_login` datetime DEFAULT NULL,
  `language` varchar(5),
- `preferences` text,
+ `preferences` longtext,
  PRIMARY KEY(`user_id`),
  UNIQUE `username` (`username`, `mail_host`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
@@ -209,4 +209,4 @@ CREATE TABLE `system` (
 
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');

SQL/mysql/2014042900.sql

@@ -0,0 +1 @@
+ALTER TABLE `users` CHANGE `preferences` `preferences` longtext;

SQL/postgres.initial.sql

@@ -290,4 +290,4 @@ CREATE TABLE "system" (
     value text
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');

SQL/postgres/2014042900.sql

@@ -0,0 +1 @@
+-- empty

SQL/sqlite.initial.sql

@@ -201,4 +201,4 @@ CREATE TABLE system (
   value text NOT NULL
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');

SQL/sqlite/2014042900.sql

@@ -0,0 +1 @@
+-- empty

bin/dumpschema.sh

@@ -1,97 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- +-----------------------------------------------------------------------+
- | bin/dumpschema.sh                                                     |
- |                                                                       |
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, 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.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Dumps database schema in XML format using MDB2_Schema               |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
-
-require INSTALL_PATH.'program/include/clisetup.php';
-
-/** callback function for schema dump **/
-function print_schema($dump)
-{
-	foreach ((array)$dump as $part)
-		echo $dump . "\n";
-}
-
-$config = new rcube_config();
-
-// don't allow public access if not in devel_mode
-if (!$config->get('devel_mode') && $_SERVER['REMOTE_ADDR']) {
-	header("HTTP/1.0 401 Access denied");
-	die("Access denied!");
-}
-
-$options = array(
-	'use_transactions' => false,
-	'log_line_break' => "\n",
-	'idxname_format' => '%s',
-	'debug' => false,
-	'quote_identifier' => true,
-	'force_defaults' => false,
-	'portability' => false,
-);
-
-$dsnw = $config->get('db_dsnw');
-$dsn_array = MDB2::parseDSN($dsnw);
-
-// set options for postgres databases
-if ($dsn_array['phptype'] == 'pgsql') {
-	$options['disable_smart_seqname'] = true;
-	$options['seqname_format'] = '%s';
-}
-
-$schema =& MDB2_Schema::factory($dsnw, $options);
-$schema->db->supported['transactions'] = false;
-
-
-// send as text/xml when opened in browser
-if ($_SERVER['REMOTE_ADDR'])
-	header('Content-Type: text/xml');
-
-
-if (PEAR::isError($schema)) {
-	$error = $schema->getMessage() . ' ' . $schema->getUserInfo();
-}
-else {
-	$dump_config = array(
-		// 'output_mode' => 'file',
-		'output' => 'print_schema',
-	);
-	
-	$definition = $schema->getDefinitionFromDatabase();
-	$definition['charset'] = 'utf8';
-
-	if (PEAR::isError($definition)) {
-		$error = $definition->getMessage() . ' ' . $definition->getUserInfo();
-	}
-	else {
-		$operation = $schema->dumpDatabase($definition, $dump_config, MDB2_SCHEMA_DUMP_STRUCTURE);
-		if (PEAR::isError($operation)) {
-			$error = $operation->getMessage() . ' ' . $operation->getUserInfo();
-		}
-	}
-}
-
-$schema->disconnect();
-
-if ($error && !$_SERVER['REMOTE_ADDR'])
-	fputs(STDERR, $error);
-
-?>

bin/gc.sh

@@ -24,4 +24,16 @@ define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
 require INSTALL_PATH.'program/include/clisetup.php';
 
 $rcmail = rcube::get_instance();
+
+$session_driver   = $rcmail->config->get('session_storage', 'db');
+$session_lifetime = $rcmail->config->get('session_lifetime', 0) * 60 * 2;
+
+// Clean expired SQL sessions
+if ($session_driver == 'db' && $session_lifetime) {
+    $db = $rcmail->get_dbh();
+    $db->query("DELETE FROM " . $db->table_name('session')
+        . " WHERE changed < " . $db->now(-$session_lifetime));
+}
+
+// Clean caches and temp directory
 $rcmail->gc();

bin/makedoc.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-TITLE="Roundcube Webmail"
-PACKAGES="Core"
-
-INSTALL_PATH="`dirname $0`/.."
-PATH_PROJECT=$INSTALL_PATH/program/include
-PATH_FRAMEWORK=$INSTALL_PATH/program/lib/Roundcube
-PATH_DOCS=$INSTALL_PATH/doc/phpdoc
-BIN_PHPDOC="`/usr/bin/which phpdoc`"
-
-if [ ! -x "$BIN_PHPDOC" ]
-then
-  echo "phpdoc not found: $BIN_PHPDOC"
-  exit 1
-fi
-
-OUTPUTFORMAT=HTML
-CONVERTER=frames
-TEMPLATE=earthli
-PRIVATE=off
-
-# make documentation
-$BIN_PHPDOC -d $PATH_PROJECT,$PATH_FRAMEWORK -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
--o $OUTPUTFORMAT:$CONVERTER:$TEMPLATE -pp $PRIVATE
-

bin/moduserprefs.sh

@@ -71,7 +71,7 @@ while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
 	$prefs[$pref_name] = $pref_value;
 
 	if ($prefs != $old_prefs) {
-		$user->save_prefs($prefs);
+		$user->save_prefs($prefs, true);
 		echo "saved.\n";
 	}
 	else {

bin/msgexport.sh

@@ -58,7 +58,7 @@ function export_mailbox($mbox, $filename)
 		$from = current(rcube_mime::decode_address_list($headers->from, 1, false));
 
 		fwrite($out, sprintf("From %s %s UID %d\n", $from['mailto'], $headers->date, $headers->uid));
-		fwrite($out, $IMAP->print_raw_body($headers->uid));
+		$IMAP->get_raw_body($headers->uid, $out);
 		fwrite($out, "\n\n\n");
 
 		progress_update($i+1, $count);

bin/update.sh

@@ -147,7 +147,7 @@ if ($RCI->configured) {
   // check file type detection
   if ($RCI->check_mime_detection()) {
     echo "WARNING: File type detection doesn't work properly!\n";
-    echo "Please check the 'mime_magic' config option or the finfo functions of PHP andrun this script again.\n";
+    echo "Please check the 'mime_magic' config option or the finfo functions of PHP and run this script again.\n";
   }
   if ($RCI->check_mime_extensions()) {
     echo "WARNING: Mimetype to file extension mapping doesn't work properly!\n";

bin/updatedb.sh

@@ -146,20 +146,9 @@ function update_db_schema($package, $version, $file)
     global $DB;
 
     // read DDL file
-    if ($lines = file($file)) {
-        $sql = '';
-        foreach ($lines as $line) {
-            if (preg_match('/^--/', $line) || trim($line) == '')
-                continue;
-
-            $sql .= $line . "\n";
-            if (preg_match('/(;|^GO)$/', trim($line))) {
-                @$DB->query(fix_table_names($sql));
-                $sql = '';
-                if ($error = $DB->is_error()) {
-                    return $error;
-                }
-            }
+    if ($sql = file_get_contents($file)) {
+        if (!$DB->exec_script($sql)) {
+            return $DB->is_error();
         }
     }
 
@@ -185,51 +174,4 @@ function update_db_schema($package, $version, $file)
     return $DB->is_error();
 }
 
-function fix_table_names($sql)
-{
-    global $DB, $RC, $dir;
-    static $tables;
-    static $sequences;
-
-    $prefix = $RC->config->get('db_prefix');
-    $engine = $DB->db_provider;
-
-    if (empty($prefix)) {
-        return $sql;
-    }
-
-    if ($tables === null) {
-        $tables    = array();
-        $sequences = array();
-
-        // read complete schema (initial) file
-        $filename = "$dir/../$engine.initial.sql";
-        $schema    = @file_get_contents($filename);
-
-        // find table names
-        if (preg_match_all('/CREATE TABLE (\[dbo\]\.|IF NOT EXISTS )?[`"\[\]]*([^`"\[\] \r\n]+)/i', $schema, $matches)) {
-            foreach ($matches[2] as $table) {
-                $tables[$table] = $prefix . $table;
-            }
-        }
-        // find sequence names
-        if ($engine == 'postgres' && preg_match_all('/CREATE SEQUENCE (IF NOT EXISTS )?"?([^" \n\r]+)/i', $schema, $matches)) {
-            foreach ($matches[2] as $sequence) {
-                $sequences[$sequence] = $prefix . $sequence;
-            }
-        }
-    }
-
-    // replace table names
-    foreach ($tables as $table => $real_table) {
-        $sql = preg_replace("/([^a-zA-Z0-9_])$table([^a-zA-Z0-9_])/", "\\1$real_table\\2", $sql);
-    }
-    // replace sequence names
-    foreach ($sequences as $sequence => $real_sequence) {
-        $sql = preg_replace("/([^a-zA-Z0-9_])$sequence([^a-zA-Z0-9_])/", "\\1$real_sequence\\2", $sql);
-    }
-
-    return $sql;
-}
-
 ?>

config/defaults.inc.php

@@ -123,6 +123,27 @@ $config['default_port'] = 143;
 // best server supported one)
 $config['imap_auth_type'] = null;
 
+// IMAP socket context options
+// See http://php.net/manual/en/context.ssl.php
+// The example below enables server certificate validation
+//$config['imap_conn_options'] = array(
+//  'ssl'         => array(
+//     'verify_peer'  => true,
+//     'verify_depth' => 3,
+//     'cafile'       => '/etc/openssl/certs/ca.crt',
+//   ),
+// );
+$config['imap_conn_options'] = null;
+
+// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
+$config['imap_timeout'] = 0;
+
+// Optional IMAP authentication identifier to be used as authorization proxy
+$config['imap_auth_cid'] = null;
+
+// Optional IMAP authentication password to be used for imap_auth_cid
+$config['imap_auth_pw'] = null;
+
 // If you know your imap's folder delimiter, you can specify it here.
 // Otherwise it will be determined automatically
 $config['imap_delimiter'] = null;
@@ -160,19 +181,13 @@ $config['imap_force_ns'] = false;
 // Note: Because the list is cached, re-login is required after change.
 $config['imap_disabled_caps'] = array();
 
-// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
-$config['imap_timeout'] = 0;
-
-// Optional IMAP authentication identifier to be used as authorization proxy
-$config['imap_auth_cid'] = null;
-
-// Optional IMAP authentication password to be used for imap_auth_cid
-$config['imap_auth_pw'] = null;
-
 // Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
 $config['imap_cache'] = null;
 
 // Enables messages cache. Only 'db' cache is supported.
+// This requires an IMAP server that supports QRESYNC and CONDSTORE
+// extensions (RFC7162). See synchronize() in program/lib/Roundcube/rcube_imap_cache.php
+// for further info, or if you experience syncing problems.
 $config['messages_cache'] = false;
 
 // Lifetime of IMAP indexes cache. Possible units: s, m, h, d, w
@@ -241,13 +256,14 @@ $config['smtp_timeout'] = 0;
 // requires 'smtp_timeout' to be non zero.
 // $config['smtp_conn_options'] = array(
 //   'ssl'         => array(
-//     'verify_peer'     => true,
-//     'verify_depth     => 3,
-//     'cafile'          => '/etc/openssl/certs/ca.crt',
+//     'verify_peer'  => true,
+//     'verify_depth' => 3,
+//     'cafile'       => '/etc/openssl/certs/ca.crt',
 //   ),
 // );
 $config['smtp_conn_options'] = null;
 
+
 // ----------------------------------
 // LDAP
 // ----------------------------------
@@ -355,9 +371,13 @@ $config['session_storage'] = 'db';
 // Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
 $config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
 
-// check client IP in session athorization
+// check client IP in session authorization
 $config['ip_check'] = false;
 
+// List of trusted proxies
+// X_FORWARDED_* and X_REAL_IP headers are only accepted from these IPs
+$config['proxy_whitelist'] = array();
+
 // check referer of incoming requests
 $config['referer_check'] = false;
 
@@ -620,6 +640,10 @@ $config['spellcheck_ignore_syms'] = false;
 // Use this char/string to separate recipients when composing a new message
 $config['recipients_separator'] = ',';
 
+// Number of lines at the end of a message considered to contain the signature.
+// Increase this value if signatures are not properly detected and colored
+$config['sig_max_lines'] = 15;
+
 // don't let users set pagesize to more than this value if set
 $config['max_pagesize'] = 200;
 
@@ -785,6 +809,8 @@ $config['ldap_public']['Verisign'] = array(
   'sizelimit'      => '0',          // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
   'timelimit'      => '0',          // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
   'referrals'      => false,        // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
+  'dereference'    => 0,            // Sets the LDAP_OPT_DEREF option. One of: LDAP_DEREF_NEVER, LDAP_DEREF_SEARCHING, LDAP_DEREF_FINDING, LDAP_DEREF_ALWAYS
+                                    // Used where addressbook contains aliases to objects elsewhere in the LDAP tree.
 
   // definition for contact groups (uncomment if no groups are supported)
   // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
@@ -961,9 +987,12 @@ $config['check_all_folders'] = false;
 // If true, after message delete/move, the next message will be displayed
 $config['display_next'] = true;
 
-// 0 - Do not expand threads 
-// 1 - Expand all threads automatically 
-// 2 - Expand only threads with unread messages 
+// Default messages listing mode. One of 'threads' or 'list'.
+$config['default_list_mode'] = 'list';
+
+// 0 - Do not expand threads
+// 1 - Expand all threads automatically
+// 2 - Expand only threads with unread messages
 $config['autoexpand_threads'] = 0;
 
 // When replying:

index.php

@@ -2,9 +2,9 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.0-git                                                         |
+ | Version 1.0.12                                                          |
  |                                                                         |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |
@@ -172,6 +172,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
 
 // end session (after optional referer check)
 else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])
+    && $RCMAIL->check_request(rcube_utils::INPUT_GET)
     && (!$RCMAIL->config->get('referer_check') || rcube_utils::check_referer())
 ) {
     $userdata = array(
@@ -207,6 +208,15 @@ if (empty($RCMAIL->user->ID)) {
         $session_error = true;
     }
 
+    if ($session_error || $_REQUEST['_err'] == 'session') {
+        $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
+    }
+
+    if ($OUTPUT->ajax_call || $OUTPUT->get_env('framed')) {
+        $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
+        $OUTPUT->send('iframe');
+    }
+
     // check if installer is still active
     if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
         $OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
@@ -218,15 +228,6 @@ if (empty($RCMAIL->user->ID)) {
         ));
     }
 
-    if ($session_error || $_REQUEST['_err'] == 'session') {
-        $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
-    }
-
-    if ($OUTPUT->ajax_call || !empty($_REQUEST['_framed'])) {
-        $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
-        $OUTPUT->send('iframe');
-    }
-
     $plugin = $RCMAIL->plugins->exec_hook('unauthenticated', array('task' => 'login', 'error' => $session_error));
 
     $RCMAIL->set_task($plugin['task']);

installer/check.php

@@ -28,10 +28,10 @@ $optional_php_exts = array(
 );
 
 $required_libs = array(
-    'PEAR'      => 'PEAR.php',
-    'Net_SMTP'  => 'Net/SMTP.php',
-    'Net_IDNA2' => 'Net/IDNA2.php',
-    'Mail_mime' => 'Mail/mime.php',
+    'PEAR'      => 'pear.php.net',
+    'Net_SMTP'  => 'pear.php.net',
+    'Net_IDNA2' => 'pear.php.net',
+    'Mail_mime' => 'pear.php.net',
 );
 
 $ini_checks = array(

installer/config.php

@@ -152,15 +152,18 @@ echo $check_spell->show(intval($RCI->getprop('enable_spellcheck')), array('value
 <?php
 $select_spell = new html_select(array('name' => '_spellcheck_engine', 'id' => "cfgspellcheckengine"));
 if (extension_loaded('pspell'))
-  $select_spell->add('pspell', 'pspell');
+  $select_spell->add('Pspell', 'pspell');
+if (extension_loaded('enchant'))
+  $select_spell->add('Enchant', 'enchant');
 $select_spell->add('Googie', 'googie');
+$select_spell->add('ATD', 'atd');
 
 echo $select_spell->show($RCI->is_post ? $_POST['_spellcheck_engine'] : 'pspell');
 
 ?>
 <label for="cfgspellcheckengine">Which spell checker to use</label><br />
 
-<p class="hint">GoogieSpell implies that the message content will be sent to Google in order to check the spelling.</p>
+<p class="hint">Googie implies that the message content will be sent to external server to check the spelling.</p>
 </dd>
 
 <dt class="propname">identities_level</dt>
@@ -172,6 +175,7 @@ $input_ilevel->add('many identities with possibility to edit all params', 0);
 $input_ilevel->add('many identities with possibility to edit all params but not email address', 1);
 $input_ilevel->add('one identity with possibility to edit all params', 2);
 $input_ilevel->add('one identity with possibility to edit all params but not email address', 3);
+$input_ilevel->add('one identity with possibility to edit only signature', 4);
 echo $input_ilevel->show($RCI->getprop('identities_level'), 0);
 
 ?>

installer/rcube_install.php

@@ -490,7 +490,7 @@ class rcube_install
     $types = array(
       'application/zip'   => 'zip',
       'application/x-tar' => 'tar',
-      'application/java-archive' => 'jar',
+      'application/pdf'   => 'pdf',
       'image/gif'     => 'gif',
       'image/svg+xml' => 'svg',
     );
@@ -498,7 +498,7 @@ class rcube_install
     $errors = array();
     foreach ($types as $mimetype => $expected) {
       $ext = rcube_mime::get_mime_extensions($mimetype);
-      if ($ext[0] != $expected) {
+      if (!in_array($expected, (array) $ext)) {
         $errors[] = array($mimetype, $ext, $expected);
       }
     }
@@ -724,7 +724,8 @@ class rcube_install
     // read schema file from /SQL/*
     $fname = INSTALL_PATH . "SQL/$engine.initial.sql";
     if ($sql = @file_get_contents($fname)) {
-      $this->exec_sql($sql, $DB);
+      $DB->set_option('table_prefix', $this->config['db_prefix']);
+      $DB->exec_script($sql);
     }
     else {
       $this->fail('DB Schema', "Cannot read the schema file: $fname");
@@ -758,63 +759,6 @@ class rcube_install
   }
 
 
-  /**
-   * Execute the given SQL queries on the database connection
-   *
-   * @param string SQL queries to execute
-   * @param object rcube_db Database connection
-   * @return boolen True on success, False on error
-   */
-  function exec_sql($sql, $DB)
-  {
-    $sql = $this->fix_table_names($sql, $DB);
-    $buff = '';
-    foreach (explode("\n", $sql) as $line) {
-      if (preg_match('/^--/', $line) || trim($line) == '')
-        continue;
-
-      $buff .= $line . "\n";
-      if (preg_match('/(;|^GO)$/', trim($line))) {
-        $DB->query($buff);
-        $buff = '';
-        if ($DB->is_error())
-          break;
-      }
-    }
-
-    return !$DB->is_error();
-  }
-
-
-  /**
-   * Parse SQL file and fix table names according to db_prefix
-   * Note: This need to be a complete database initial file
-   */
-  private function fix_table_names($sql, $DB)
-  {
-    if (empty($this->config['db_prefix'])) {
-        return $sql;
-    }
-
-    // replace table names
-    if (preg_match_all('/CREATE TABLE (\[dbo\]\.|IF NOT EXISTS )?[`"\[\]]*([^`"\[\] \r\n]+)/i', $sql, $matches)) {
-      foreach ($matches[2] as $table) {
-        $real_table = $this->config['db_prefix'] . $table;
-        $sql = preg_replace("/([^a-zA-Z0-9_])$table([^a-zA-Z0-9_])/", "\\1$real_table\\2", $sql);
-      }
-    }
-    // replace sequence names
-    if ($DB->db_provider == 'postgres' && preg_match_all('/CREATE SEQUENCE (IF NOT EXISTS )?"?([^" \n\r]+)/i', $sql, $matches)) {
-      foreach ($matches[2] as $sequence) {
-        $real_sequence = $this->config['db_prefix'] . $sequence;
-        $sql = preg_replace("/([^a-zA-Z0-9_])$sequence([^a-zA-Z0-9_])/", "\\1$real_sequence\\2", $sql);
-      }
-    }
-
-    return $sql;
-  }
-
-
   /**
    * Handler for Roundcube errors
    */

installer/test.php

@@ -91,7 +91,7 @@ if ($RCI->config['log_driver'] != 'syslog')
     $dirs[] = $RCI->config['log_dir'] ? $RCI->config['log_dir'] : 'logs';
 
 foreach ($dirs as $dir) {
-    $dirpath = $dir[0] == '/' ? $dir : INSTALL_PATH . $dir;
+    $dirpath = rcube_utils::is_absolute_path($dir) ? $dir : INSTALL_PATH . $dir;
     if (is_writable(realpath($dirpath))) {
         $RCI->pass($dir);
         $pass = true;
@@ -115,6 +115,7 @@ $db_working = false;
 if ($RCI->configured) {
     if (!empty($RCI->config['db_dsnw'])) {
         $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
+        $DB->set_debug((bool)$RCI->config['sql_debug']);
         $DB->db_connect('w');
 
         if (!($db_error_msg = $DB->is_error())) {
@@ -209,7 +210,6 @@ if ($db_working) {
 
 <h3>Test filetype detection</h3>
 
-<p>
 <?php
 
 if ($errors = $RCI->check_mime_detection()) {
@@ -224,12 +224,9 @@ if ($errors = $RCI->check_mime_detection()) {
 }
 else {
   $RCI->pass('Fileinfo/mime_content_type configuration');
+  echo "<br/>";
 }
 
-?>
-</p>
-<p>
-<?php
 
 if ($errors = $RCI->check_mime_extensions()) {
   $RCI->fail('Mimetype to file extension mapping');
@@ -238,6 +235,7 @@ if ($errors = $RCI->check_mime_extensions()) {
 }
 else {
   $RCI->pass('Mimetype to file extension mapping');
+  echo "<br/>";
 }
 
 ?>
@@ -424,6 +422,11 @@ if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user
   $imap_user = idn_to_ascii($_POST['_user']);
 
   $imap = new rcube_imap(null);
+  $imap->set_options(array(
+    'auth_type' => $RCI->getprop('imap_auth_type'),
+    'debug'     => $RCI->getprop('imap_debug'),
+  ));
+
   if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {
     $RCI->pass('IMAP connect', 'SORT capability: ' . ($imap->get_capability('SORT') ? 'yes' : 'no'));
     $imap->close();

plugins/acl/acl.js

@@ -11,9 +11,16 @@ if (window.rcmail) {
             rcmail.acl_list_init();
             // enable autocomplete on user input
             if (rcmail.env.acl_users_source) {
-                rcmail.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'});
+                var inst = rcmail.is_framed() ? parent.rcmail : rcmail;
+                inst.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'});
+
+                // pass config settings and localized texts to autocomplete context
+                inst.set_env({ autocomplete_max:rcmail.env.autocomplete_max, autocomplete_min_length:rcmail.env.autocomplete_min_length });
+                inst.add_label('autocompletechars', rcmail.labels.autocompletechars);
+                inst.add_label('autocompletemore', rcmail.labels.autocompletemore);
+
                 // fix inserted value
-                rcmail.addEventListener('autocomplete_insert', function(e) {
+                inst.addEventListener('autocomplete_insert', function(e) {
                     if (e.field.id != 'acluser')
                         return;
 
@@ -55,8 +62,11 @@ rcube_webmail.prototype.acl_delete = function()
     var users = this.acl_get_usernames();
 
     if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
-        this.http_request('settings/plugin.acl', '_act=delete&_user='+urlencode(users.join(','))
-            + '&_mbox='+urlencode(this.env.mailbox),
+        this.http_post('settings/plugin.acl', {
+                _act: 'delete',
+                _user: users.join(','),
+                _mbox: this.env.mailbox
+            },
             this.set_busy(true, 'acl.deleting'));
     }
 }
@@ -64,14 +74,14 @@ rcube_webmail.prototype.acl_delete = function()
 // Save ACL data
 rcube_webmail.prototype.acl_save = function()
 {
-    var user = $('#acluser').val(), rights = '', type;
+    var data, type, rights = '', user = $('#acluser', this.acl_form).val();
 
-    $(':checkbox', this.env.acl_advanced ? $('#advancedrights') : sim_ul = $('#simplerights')).map(function() {
+    $((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {
         if (this.checked)
             rights += this.value;
     });
 
-    if (type = $('input:checked[name=usertype]').val()) {
+    if (type = $('input:checked[name=usertype]', this.acl_form).val()) {
         if (type != 'user')
             user = type;
     }
@@ -85,19 +95,25 @@ rcube_webmail.prototype.acl_save = function()
         return;
     }
 
-    this.http_request('settings/plugin.acl', '_act=save'
-        + '&_user='+urlencode(user)
-        + '&_acl=' +rights
-        + '&_mbox='+urlencode(this.env.mailbox)
-        + (this.acl_id ? '&_old='+this.acl_id : ''),
-        this.set_busy(true, 'acl.saving'));
+    data = {
+        _act: 'save',
+        _user: user,
+        _acl: rights,
+        _mbox: this.env.mailbox
+    }
+
+    if (this.acl_id) {
+        data._old = this.acl_id;
+    }
+
+    this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));
 }
 
 // Cancel/Hide form
 rcube_webmail.prototype.acl_cancel = function()
 {
     this.ksearch_blur();
-    this.acl_form.hide();
+    this.acl_popup.dialog('close');
 }
 
 // Update data after save (and hide form)
@@ -115,7 +131,7 @@ rcube_webmail.prototype.acl_update = function(o)
     // hide autocomplete popup
     this.ksearch_blur();
     // hide form
-    this.acl_form.hide();
+    this.acl_popup.dialog('close');
 }
 
 // Switch table display mode
@@ -132,7 +148,9 @@ rcube_webmail.prototype.acl_mode_switch = function(elem)
 // ACL table initialization
 rcube_webmail.prototype.acl_list_init = function()
 {
-    $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');
+    var method = this.env.acl_advanced ? 'addClass' : 'removeClass';
+    $('#acl-switch')[method]('selected');
+    $(this.gui_objects.acltable)[method]('advanced');
 
     this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
         {multiselect:true, draggable:false, keyboard:true, toggleselect:true});
@@ -300,7 +318,6 @@ rcube_webmail.prototype.acl_init_form = function(id)
     if (id && (row = this.acl_list.rows[id])) {
         row = row.obj;
         li_elements.map(function() {
-            val = this.value;
             td = $('td.'+this.id, row);
             if (td.length && td.hasClass('enabled'))
                 this.checked = true;
@@ -312,22 +329,38 @@ rcube_webmail.prototype.acl_init_form = function(id)
             type = id;
     }
     // mark read (lrs) rights by default
-    else
+    else {
         li_elements.filter(function() { return this.id.match(/^acl([lrs]|read)$/); }).prop('checked', true);
+    }
 
     name_input.val(val);
     $('input[value='+type+']').prop('checked', true);
 
     this.acl_id = id;
 
-    // position the form horizontally
-    var bw = body.width(), mw = this.acl_form.width();
+    var me = this, inst = window.rcmail, body = document.body;
+    var buttons = {};
+    buttons[rcmail.gettext('save')] = function(e) { inst.command('acl-save'); };
+    buttons[rcmail.gettext('cancel')] = function(e) { inst.command('acl-cancel'); };
+
+    // display it as popup
+    this.acl_popup = rcmail.show_popup_dialog(
+        '<div style="width:480px;height:280px">&nbsp;</div>',
+        id ? rcmail.gettext('acl.editperms') : rcmail.gettext('acl.newuser'),
+        buttons,
+        {
+            modal: true,
+            closeOnEscape: false,
+            close: function(e, ui) {
+                (rcmail.is_framed() ? parent.rcmail : rcmail).ksearch_hide();
+                me.acl_form.appendTo(body).hide();
+                $(this).remove();
+            }
+        }
+    );
 
-    if (bw >= mw)
-        this.acl_form.css({left: parseInt((bw - mw)/2)+'px'});
+    this.acl_form.appendTo(this.acl_popup).show();
 
-    // display it
-    this.acl_form.show();
     if (type == 'user')
         name_input.focus();
 

plugins/acl/acl.php

@@ -111,6 +111,20 @@ class acl extends rcube_plugin
                     $users[] = $user;
                 }
             }
+
+            if ($this->rc->config->get('acl_groups')) {
+                $prefix = $this->rc->config->get('acl_group_prefix');
+                $result = $this->ldap->list_groups($search, $mode);
+
+                foreach ($result as $record) {
+                    $group = $record['name'];
+
+                    if ($group) {
+                        $users[] = array('name' => ($prefix ? $prefix : '')  . $group, 'display' => $group);
+                        $keys[]  = $group;
+                    }
+                }
+            }
         }
 
         sort($users, SORT_LOCALE_STRING);
@@ -150,7 +164,8 @@ class acl extends rcube_plugin
         $this->load_config();
         $this->specials = $this->rc->config->get('acl_specials', $this->specials);
         $this->add_texts('localization/', array('deleteconfirm', 'norights',
-            'nouser', 'deleting', 'saving'));
+            'nouser', 'deleting', 'saving', 'newuser', 'editperms'));
+        $this->rc->output->add_label('save', 'cancel');
         $this->include_script('acl.js');
         $this->rc->output->include_script('list.js');
         $this->include_stylesheet($this->local_skin_path().'/acl.css');
@@ -307,7 +322,7 @@ class acl extends rcube_plugin
                     . $val);
             }
 
-            $out = html::tag('ul', array('id' => 'usertype'), $ul, html::$common_attrib);
+            $out = html::tag('ul', array('id' => 'usertype', 'class' => $attrib['class']), $ul, html::$common_attrib);
         }
         // Display text input alone
         else {
@@ -428,19 +443,23 @@ class acl extends rcube_plugin
      */
     private function action_save()
     {
-        $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));
+        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); // UTF7-IMAP
+        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
+        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_POST));
+        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_POST));
 
         $acl    = array_intersect(str_split($acl), $this->rights_supported());
         $users  = $oldid ? array($user) : explode(',', $user);
         $result = 0;
 
         foreach ($users as $user) {
-            $user = trim($user);
+            $user   = trim($user);
+            $prefix = $this->rc->config->get('acl_groups') ? $this->rc->config->get('acl_group_prefix') : '';
 
-            if (!empty($this->specials) && in_array($user, $this->specials)) {
+            if ($prefix && strpos($user, $prefix) === 0) {
+                $username = $user;
+            }
+            else if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $username = $this->gettext($user);
             }
             else if (!empty($user)) {
@@ -480,8 +499,8 @@ class acl extends rcube_plugin
      */
     private function action_delete()
     {
-        $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));
+        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); //UTF7-IMAP
+        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
 
         $user = explode(',', $user);
 

plugins/acl/config.inc.php.dist

@@ -16,10 +16,15 @@ $config['acl_users_field'] = 'mail';
 // The LDAP search filter will be &'d with search queries
 $config['acl_users_filter'] = '';
 
+// Enable LDAP groups in user autocompletion.
+// Note: LDAP addressbook defined in acl_users_source must include groups config
+$config['acl_groups'] = false;
+
+// Prefix added to the group name to build IMAP ACL identifier
+$config['acl_group_prefix'] = 'group:';
+
 // Include the following 'special' access control subjects in the ACL dialog;
 // Defaults to array('anyone', 'anonymous') (not when set to an empty array)
 // Example: array('anyone') to exclude 'anonymous'.
 // Set to an empty array to exclude all special aci subjects.
 $config['acl_specials'] = array('anyone', 'anonymous');
-
-?>

plugins/acl/localization/ar_SA.inc

@@ -0,0 +1,91 @@
+<?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'] = 'وضع متقدم';
+$labels['newuser'] = 'اضافة مدخل';
+$labels['editperms'] = 'تعديل الصلاحيات';
+$labels['actions'] = 'اجراءات حقوق الوصول...';
+$labels['anyone'] = 'كل المستخدمين(اي شخص)';
+$labels['anonymous'] = 'ضيف (مجهول)';
+$labels['identifier'] = 'معرف';
+$labels['acll'] = 'بحث';
+$labels['aclr'] = 'قراءة الرسائل';
+$labels['acls'] = 'ابقاء حالة الزيارة';
+$labels['aclw'] = 'اكتب رمز';
+$labels['acli'] = 'ادخل (نسخ الى)';
+$labels['aclp'] = 'نشر';
+$labels['aclc'] = 'إنشاء مجلدات فرعية';
+$labels['aclk'] = 'إنشاء مجلدات فرعية';
+$labels['acld'] = 'حذف الرسائل';
+$labels['aclt'] = 'حذف الرسائل';
+$labels['acle'] = 'حُذف';
+$labels['aclx'] = 'حذف المجلد';
+$labels['acla'] = 'ادارة';
+$labels['aclfull'] = 'تحكم كامل';
+$labels['aclother'] = 'اخرى';
+$labels['aclread'] = 'قراءة ';
+$labels['aclwrite'] = 'كتابة';
+$labels['acldelete'] = 'حذف';
+$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['longacls'] = 'وسم الزيارة في الرسائل بالامكان تغييره';
+$labels['longaclw'] = 'وسم والكلمات الرئيسية في الرسائل يمكن تغييره, ماعدا الزيارة والحذف ';
+$labels['longacli'] = 'بالامكان كتابة الرسائل ونسخها الى هذا المجلد';
+$labels['longaclp'] = 'بالامكان نشر الرسائل الى هذ المجلد';
+$labels['longaclc'] = 'بالامكان انشاء المجلدات ( او اعادة التسمية ) مباشرة تحت هذا المجلد';
+$labels['longaclk'] = 'بالامكان انشاء المجلدات ( او اعادة التسمية ) مباشرة تحت هذا المجلد';
+$labels['longacld'] = 'حذف وسم الرسائل من الممكن تغييرة';
+$labels['longaclt'] = 'حذف وسم الرسائل من الممكن تغييرة';
+$labels['longacle'] = 'بالامكان شطب الرسائل';
+$labels['longaclx'] = 'هذا المجلد بالامكان حذفة او اعادة تسميته';
+$labels['longacla'] = 'حقوق الوصول لهذا المجلد بالامكان تغييره';
+$labels['longaclfull'] = 'التحكم الكامل يتضمن ادارة المجلدات';
+$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'] = 'لم يتم تحديد اسم مستخدم!';
+?>

plugins/acl/localization/ast.inc

@@ -0,0 +1,80 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Compartición';
+$labels['myrights'] = 'Drechos d\'accesu';
+$labels['username'] = 'Usuariu:';
+$labels['advanced'] = 'Mou avanzáu';
+$labels['newuser'] = 'Amestar entrada';
+$labels['editperms'] = 'Editar permisos';
+$labels['actions'] = 'Aición de drechos d\'accesu...';
+$labels['anyone'] = 'Tolos usuarios (toos)';
+$labels['anonymous'] = 'Convidaos (anónimos)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Guetar';
+$labels['aclr'] = 'Lleer mensaxes';
+$labels['acls'] = 'Estáu Caltener Vistu';
+$labels['aclw'] = 'Escribir banderes';
+$labels['acli'] = 'Inxertar (copiar a)';
+$labels['aclc'] = 'Crear subcarpetes';
+$labels['aclk'] = 'Crear subcarpetes';
+$labels['acld'] = 'Desaniciar mensaxes';
+$labels['aclt'] = 'Desaniciar mensaxes';
+$labels['acle'] = 'Desanciar';
+$labels['aclx'] = 'Desaniciar carpeta';
+$labels['acla'] = 'Alministrar';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Otru';
+$labels['aclread'] = 'Lleer';
+$labels['aclwrite'] = 'Escribir';
+$labels['acldelete'] = 'Desaniciar';
+$labels['shortacll'] = 'Guetar';
+$labels['shortaclr'] = 'Lleer';
+$labels['shortacls'] = 'Caltener';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Inxertar';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Desaniciar';
+$labels['shortaclt'] = 'Desaniciar';
+$labels['shortacle'] = 'Desaniciar';
+$labels['shortaclx'] = 'Desaniciu de carpeta';
+$labels['shortacla'] = 'Alministrar';
+$labels['shortaclother'] = 'Otru';
+$labels['shortaclread'] = 'Lleer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Desaniciar';
+$labels['longacll'] = 'La carpeta ye visible nes llistes y pue soscribise a';
+$labels['longaclr'] = 'La carpeta nun pue abrise pa leer';
+$labels['longaclx'] = 'La carpeta pue desaniciase o renomase';
+$labels['longacla'] = 'Puen camudase los drechos d\'accesu de la carpeta';
+$labels['longaclfull'] = 'Control completu incluyendo l\'alminitración de carpeta';
+$labels['longaclread'] = 'La carpeta pue abrise pa llectura';
+$labels['longaclwrite'] = 'Los mensaxes puen conseñase, escribise o copiase a la carpeta';
+$labels['longacldelete'] = 'Los mensaxes puen desaniciase';
+$labels['longaclother'] = 'Otros drechos d\'accesu';
+$labels['ariasummaryacltable'] = 'Llista de drechos d\'accesu';
+$messages['deleting'] = 'Desaniciando los drechos d\'accesu...';
+$messages['saving'] = 'Guardando los drechos d\'accesu...';
+$messages['updatesuccess'] = 'Camudaos con ésitu los drechos d\'accesu';
+$messages['deletesuccess'] = 'Desaniciaos con ésitu los drechos d\'accesu';
+$messages['createsuccess'] = 'Amestaos con ésitu los drechos d\'accesu';
+$messages['updateerror'] = 'Nun puen anovase los drechos d\'accesu';
+$messages['deleteerror'] = 'Nun puen desaniciase los drechos d\'accesu';
+$messages['createerror'] = 'Nun puen amestase los drechos d\'accesu';
+$messages['deleteconfirm'] = '¿De xuru quies desaniciar los drechos d\'accesu al(a los) usuariu(os) esbilláu(os)?';
+?>

plugins/acl/localization/az_AZ.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
 $labels['advanced'] = 'Ekspert rejimi';
 $labels['newuser'] = 'Sahə əlavə et';
+$labels['editperms'] = 'Cavabları redaktə et';
 $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)';

plugins/acl/localization/be_BE.inc

@@ -16,11 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'Сумесны доступ';
-$labels['myrights'] = 'Правы доступа';
+$labels['myrights'] = 'Правы доступу';
 $labels['username'] = 'Карыстальнік:';
-$labels['advanced'] = 'экспертны рэжым';
+$labels['advanced'] = 'Пашыраны рэжым';
 $labels['newuser'] = 'Дадаць запіс';
-$labels['actions'] = 'Дзеянні з правамі доступа...';
+$labels['editperms'] = 'Рэдагаваць правы доступу';
+$labels['actions'] = 'Дзеянні з правамі доступу...';
 $labels['anyone'] = 'Усе карыстальнікі (любыя)';
 $labels['anonymous'] = 'Госці (ананімныя)';
 $labels['identifier'] = 'Ідэнтыфікатар';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Выдаліць паведамленні';
 $labels['acle'] = 'Знішчыць паведамленні';
 $labels['aclx'] = 'Выдаліць папку';
 $labels['acla'] = 'Адміністраваць';
+$labels['acln'] = 'Анатаваць паведамленні';
 $labels['aclfull'] = 'Поўны доступ';
 $labels['aclother'] = 'Іншае';
 $labels['aclread'] = 'Чытанне';
@@ -55,12 +57,13 @@ $labels['shortaclt'] = 'Выдаленне';
 $labels['shortacle'] = 'Знішчэнне';
 $labels['shortaclx'] = 'Выдаленне папкі';
 $labels['shortacla'] = 'Адміністраванне';
+$labels['shortacln'] = 'Анатаваць';
 $labels['shortaclother'] = 'Іншае';
 $labels['shortaclread'] = 'Чытанне';
 $labels['shortaclwrite'] = 'Запіс';
 $labels['shortacldelete'] = 'Выдаленне';
 $labels['longacll'] = 'Папку можна пабачыць у спісах і падпісацца на яе';
-$labels['longaclr'] = 'Папку можна адчыніць для чытання';
+$labels['longaclr'] = 'Папку можна адкрыць для чытання';
 $labels['longacls'] = 'На паведамленнях можна пераключаць флаг Бачанае';
 $labels['longaclw'] = 'На паведамленнях можна мяняць ключавыя словы і пераключаць флагі, апроч Бачанае і Выдаленае';
 $labels['longacli'] = 'Паведамленні могуць быць запісаныя альбо скапіяваныя ў папку';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'На паведамленнях можна пераклю
 $labels['longacle'] = 'Паведамленні могуць быць знішчаны';
 $labels['longaclx'] = 'Папку можна выдаліць альбо перайменаваць';
 $labels['longacla'] = 'Правы доступу на папку можна змяняць';
+$labels['longacln'] = 'Анатацыі паведамленняў (супольныя метаданыя) можна змяняць';
 $labels['longaclfull'] = 'Поўны доступ, уключна з адмінстраваннем папкі';
-$labels['longaclread'] = 'Папку можна адчыніць для чытання';
+$labels['longaclread'] = 'Папку можна адкрыць для чытання';
 $labels['longaclwrite'] = 'Паведамленні могуць быць пазначаныя, запісаныя альбо скапіяваныя ў папку';
-$labels['longacldelete'] = 'Паведамленні можна выдаляць';
+$labels['longacldelete'] = 'Паведамленні можна выдаліць';
+$labels['longaclother'] = 'Іншыя правы доступу';
+$labels['ariasummaryacltable'] = 'Спіс правоў доступу';
+$labels['arialabelaclactions'] = 'Спіс дзеянняў';
+$labels['arialabelaclform'] = 'Форма правоў доступу';
 $messages['deleting'] = 'Правы доступу выдаляюцца...';
 $messages['saving'] = 'Правы доступу захоўваюцца...';
 $messages['updatesuccess'] = 'Правы доступу зменены';

plugins/acl/localization/bg_BG.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Споделяне';
 $labels['myrights'] = 'Права за достъп';
 $labels['username'] = 'Потребител:';
-$labels['advanced'] = 'разширен режим';
+$labels['advanced'] = 'Разширен режим';
 $labels['newuser'] = 'Добавяне на запис';
+$labels['editperms'] = 'Редакция на права';
 $labels['actions'] = 'Действия на права за достъп...';
 $labels['anyone'] = 'Всички потребители (който и да е)';
 $labels['anonymous'] = 'Гости (анонимни)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Изтриване на писмо';
 $labels['acle'] = 'Заличаване';
 $labels['aclx'] = 'Изтриване на папка';
 $labels['acla'] = 'Администриране';
+$labels['acln'] = 'Анотиране на писма';
 $labels['aclfull'] = 'Пълен контрол';
 $labels['aclother'] = 'Други';
 $labels['aclread'] = 'Четене';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Изтриване';
 $labels['shortacle'] = 'Заличаване';
 $labels['shortaclx'] = 'Изтриване на папка';
 $labels['shortacla'] = 'Администриране';
+$labels['shortacln'] = 'Анотирай';
 $labels['shortaclother'] = 'Други';
 $labels['shortaclread'] = 'Четене';
 $labels['shortaclwrite'] = 'Писане';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Флагът Изтрито може да бъде про
 $labels['longacle'] = 'Писмата могат да бъдат заличавани';
 $labels['longaclx'] = 'Папката може да бъде изтривана или преименувана';
 $labels['longacla'] = 'Правата за достъп до папката могат да бъдат променяни';
+$labels['longacln'] = 'Могат да се променят споделените метаданни (антоции) на писмата';
 $labels['longaclfull'] = 'Пълен контрол, включително и администриране на папките';
 $labels['longaclread'] = 'Папката може да бъде отворена за четене';
 $labels['longaclwrite'] = 'Писмата могат да бъдат маркирани, записвани или копирани в папката';

plugins/acl/localization/br.inc

@@ -18,8 +18,10 @@
 $labels['sharing'] = 'Rannañ';
 $labels['myrights'] = 'Aotreoù mont e-barzh';
 $labels['username'] = 'Implijer:';
-$labels['advanced'] = 'Doare araokaet';
+$labels['newuser'] = 'Ouzhpenan un enporzh';
+$labels['actions'] = 'Aotreoù mont e-barzh';
 $labels['anyone'] = 'An holl implijerien (neb hini)';
+$labels['anonymous'] = 'pedet (dizanv)';
 $labels['aclr'] = 'Kemennadoù lennet';
 $labels['aclc'] = 'Krouiñ isrenkelloù';
 $labels['aclk'] = 'Krouiñ isrenkelloù';
@@ -28,4 +30,19 @@ $labels['aclt'] = 'Dilemel kemennadoù';
 $labels['aclx'] = 'Dilemel ar renkell';
 $labels['aclread'] = 'Lennet';
 $labels['aclwrite'] = 'Skrivañ';
+$labels['acldelete'] = 'Dilemel';
+$labels['shortaclr'] = 'Lenn';
+$labels['shortacls'] = 'Gwarezin';
+$labels['shortaclw'] = 'Skrivañ';
+$labels['shortacli'] = 'Enlakaat';
+$labels['shortaclc'] = 'Krouiñ';
+$labels['shortaclk'] = 'Krouiñ';
+$labels['shortacld'] = 'Dilemel';
+$labels['shortaclt'] = 'Dilemel';
+$labels['shortacle'] = 'Dilemel pep tra';
+$labels['shortaclx'] = 'Dilemel ar renkell';
+$labels['shortaclother'] = 'traoù all';
+$labels['shortaclread'] = 'Lenn';
+$labels['shortaclwrite'] = 'Skrivañ';
+$labels['shortacldelete'] = 'Dilemel';
 ?>

plugins/acl/localization/bs_BA.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
-$labels['advanced'] = 'napredni mod';
+$labels['advanced'] = 'Napredni mod';
 $labels['newuser'] = 'Dodaj unos';
+$labels['editperms'] = 'Uredi dozvole';
 $labels['actions'] = 'Akcije za prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (bilo ko)';
 $labels['anonymous'] = 'Gosti (anonimno)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Obriši poruke';
 $labels['acle'] = 'Izbriši';
 $labels['aclx'] = 'Obriši folder';
 $labels['acla'] = 'Administracija';
+$labels['acln'] = 'Obilježi poruke';
 $labels['aclfull'] = 'Puna kontrola';
 $labels['aclother'] = 'Ostalo';
 $labels['aclread'] = 'Pročitano';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Obriši';
 $labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
 $labels['shortacla'] = 'Administracija';
+$labels['shortacln'] = 'Obilježli';
 $labels['shortaclother'] = 'Ostalo';
 $labels['shortaclread'] = 'Pročitano';
 $labels['shortaclwrite'] = 'Piši';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Oznaka za obrisane poruke se može mijenjati';
 $labels['longacle'] = 'Poruke je moguće obrisati';
 $labels['longaclx'] = 'Folder je moguće obrisati ili preimenovati';
 $labels['longacla'] = 'Pristupna prava foldera je moguće promijeniti';
+$labels['longacln'] = 'Dijeljeni podaci (obilježavanja) poruka mogu se mijenjati';
 $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
 $labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
 $labels['longacldelete'] = 'Moguće je obrisati poruke';
+$labels['longaclother'] = 'Ostala prava pristupa';
+$labels['ariasummaryacltable'] = 'Lista prava pristupa';
+$labels['arialabelaclactions'] = 'Lista akcija';
+$labels['arialabelaclform'] = 'Obrazac za prava pristupa';
 $messages['deleting'] = 'Brišem prava pristupa...';
 $messages['saving'] = 'Snimam prava pristupa...';
 $messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';

plugins/acl/localization/ca_ES.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
-$labels['advanced'] = 'mode avançat';
+$labels['advanced'] = 'Mode Avançat';
 $labels['newuser'] = 'Afegeix una entrada';
+$labels['editperms'] = 'Editar Permisos';
 $labels['actions'] = 'Accions dels permisos d\'accés...';
 $labels['anyone'] = 'Tots els usuaris (qualsevol)';
 $labels['anonymous'] = 'Convidats (anònim)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Suprimeix missatges';
 $labels['acle'] = 'Buida';
 $labels['aclx'] = 'Suprimeix carpeta';
 $labels['acla'] = 'Administra';
+$labels['acln'] = 'Anota missatges';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Un altre';
 $labels['aclread'] = 'Lectura';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Suprimeix';
 $labels['shortacle'] = 'Buida';
 $labels['shortaclx'] = 'Suprimeix carpeta';
 $labels['shortacla'] = 'Administra';
+$labels['shortacln'] = 'Anota';
 $labels['shortaclother'] = 'Un altre';
 $labels['shortaclread'] = 'Lectura';
 $labels['shortaclwrite'] = 'Escriptura';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Els missatges amb l\'indicador Suprimit poden ser canviat
 $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['longacln'] = 'Les metadades compartides dels missatges (anotacions) poden ser canviades';
 $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['longaclother'] = 'Altres drets d\'accés';
+$labels['ariasummaryacltable'] = 'Llista els drets d\'accés';
+$labels['arialabelaclactions'] = 'Llista les accions';
+$labels['arialabelaclform'] = 'Formulari de drets d\'accés';
 $messages['deleting'] = 'S\'estan suprimint els permisos d\'accés...';
 $messages['saving'] = 'S\'estan desant els permisos d\'accés...';
 $messages['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';

plugins/acl/localization/cs_CZ.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Sdílení';
 $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
-$labels['advanced'] = 'pokročilý režim';
+$labels['advanced'] = 'Pokročilý režim';
 $labels['newuser'] = 'Přidat záznam';
+$labels['editperms'] = 'Upravit oprávnění';
 $labels['actions'] = 'Přístupové právo akce ...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
@@ -76,6 +77,7 @@ $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['ariasummaryacltable'] = 'Seznam oprávnění';
 $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';

plugins/acl/localization/cy_GB.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
 $labels['advanced'] = 'Modd uwch';
 $labels['newuser'] = 'Ychwanegu cofnod';
+$labels['editperms'] = 'Golygu hawliau';
 $labels['actions'] = 'Gweithredoedd hawl mynediad...';
 $labels['anyone'] = 'Pob defnyddiwr (unrhywun)';
 $labels['anonymous'] = 'Gwestai (anhysbys)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Dileu negeseuon';
 $labels['acle'] = 'Dileu';
 $labels['aclx'] = 'Dileu ffolder';
 $labels['acla'] = 'Gweinyddu';
+$labels['acln'] = 'Anodi negeseuon';
 $labels['aclfull'] = 'Rheolaeth lawn';
 $labels['aclother'] = 'Arall';
 $labels['aclread'] = 'Darllen';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Dileu';
 $labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
 $labels['shortacla'] = 'Gweinyddu';
+$labels['shortacln'] = 'Anodi';
 $labels['shortaclother'] = 'Arall';
 $labels['shortaclread'] = 'Darllen';
 $labels['shortaclwrite'] = 'Ysgrifennu';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Gellir newid negeseuon metadata (anodiadau) a rannwyd';
 $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['longaclother'] = 'Hawliau mynediad eraill';
+$labels['ariasummaryacltable'] = 'Rhestr o hawliau mynediad';
+$labels['arialabelaclactions'] = 'Rhestru gweithrediadau';
+$labels['arialabelaclform'] = 'Ffurflen hawliau mynediad';
 $messages['deleting'] = 'Yn dileu hawliau mynediad...';
 $messages['saving'] = 'Yn cadw hawliau mynediad...';
 $messages['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';

plugins/acl/localization/da_DK.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
-$labels['advanced'] = 'avanceret mode';
+$labels['advanced'] = 'Avanceret tilstand';
 $labels['newuser'] = 'Tilføj indgang';
+$labels['editperms'] = 'Rediger tilladelser';
 $labels['actions'] = 'Tilgangsrettigheder...';
 $labels['anyone'] = 'Alle brugere';
 $labels['anonymous'] = 'Gæst (anonym)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Slet beskeder';
 $labels['acle'] = 'Udslet';
 $labels['aclx'] = 'Slet mappe';
 $labels['acla'] = 'Administrer';
+$labels['acln'] = 'Annoter beskeder';
 $labels['aclfull'] = 'Fuld kontrol';
 $labels['aclother'] = 'Andet';
 $labels['aclread'] = 'Læse';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Slet';
 $labels['shortacle'] = 'Udslet';
 $labels['shortaclx'] = 'Slet mappe';
 $labels['shortacla'] = 'Administrer';
+$labels['shortacln'] = 'Annoter';
 $labels['shortaclother'] = 'Andet';
 $labels['shortaclread'] = 'Læse';
 $labels['shortaclwrite'] = 'Skrive';

plugins/acl/localization/de_CH.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
-$labels['advanced'] = 'erweiterter Modus';
+$labels['advanced'] = 'Expertenmodus';
 $labels['newuser'] = 'Eintrag hinzufügen';
+$labels['editperms'] = 'Zugriffsrechte bearbeiten';
 $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Nachrichten als gelöscht markieren';
 $labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
+$labels['acln'] = 'Nachrichten auszeichnen';
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Löschen';
 $labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
 $labels['shortacla'] = 'Verwalten';
+$labels['shortacln'] = 'Auszeichnen';
 $labels['shortaclother'] = 'Andere';
 $labels['shortaclread'] = 'Lesen';
 $labels['shortaclwrite'] = 'Schreiben';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Geteilte Nachrichten-Auszeichnungen (Metadaten) können nicht 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['longaclother'] = 'Andere Zugriffsrechte ';
+$labels['ariasummaryacltable'] = 'Liste der Zugriffsrechte';
+$labels['arialabelaclactions'] = 'Listen-Aktionen';
+$labels['arialabelaclform'] = 'Zugriffsrechte (Formular)';
 $messages['deleting'] = 'Zugriffsrechte werden entzogen...';
 $messages['saving'] = 'Zugriffsrechte werden gespeichert...';
 $messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';

plugins/acl/localization/de_DE.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
-$labels['advanced'] = 'erweiterter Modus';
+$labels['advanced'] = 'Erweiterter Modus';
 $labels['newuser'] = 'Eintrag hinzufügen';
+$labels['editperms'] = 'Zugriffsrechte bearbeiten';
 $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Nachrichten als gelöscht markieren';
 $labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
+$labels['acln'] = 'Nachrichten kommentieren';
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Löschen';
 $labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
 $labels['shortacla'] = 'Verwalten';
+$labels['shortacln'] = 'Kommentieren';
 $labels['shortaclother'] = 'Andere';
 $labels['shortaclread'] = 'Lesen';
 $labels['shortaclwrite'] = 'Schreiben';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Nachrichten Metadaten (Vermerke) 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['longaclother'] = 'Andere Zugriffsrechte';
+$labels['ariasummaryacltable'] = 'Liste von Zugriffsrechten';
+$labels['arialabelaclactions'] = 'Aktionen anzeigen';
+$labels['arialabelaclform'] = 'Zugriffsrechteformular';
 $messages['deleting'] = 'Zugriffsrechte werden entzogen...';
 $messages['saving'] = 'Zugriffsrechte werden gewährt...';
 $messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';

plugins/acl/localization/el_GR.inc

@@ -15,76 +15,84 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-$labels['sharing'] = 'Μοιρασμα';
+$labels['sharing'] = 'Κοινή χρήση';
 $labels['myrights'] = 'Δικαιώματα Πρόσβασης ';
-$labels['username'] = 'Χρηστης:';
-$labels['advanced'] = 'προηγμένη λειτουργία ';
+$labels['username'] = 'Χρήστης:';
+$labels['advanced'] = 'Προηγμένη λειτουργία';
 $labels['newuser'] = 'Προσθήκη καταχώρησης ';
-$labels['actions'] = 'Πρόσβαση σωστων ενέργειων...';
-$labels['anyone'] = 'Όλοι οι χρήστες (ο καθένας)';
-$labels['anonymous'] = 'Οι επισκέπτες (ανώνυμα) ';
+$labels['editperms'] = 'Μεταβολή δικαιωμάτων';
+$labels['actions'] = 'Ενέργειες δικαιωμάτων πρόσβασης...';
+$labels['anyone'] = 'Όλοι οι χρήστες (οποιοσδήποτε)';
+$labels['anonymous'] = 'Επισκέπτες (ανώνυμοι)';
 $labels['identifier'] = 'Αναγνωριστικό';
-$labels['acll'] = 'Αναζήτηση ';
+$labels['acll'] = 'Αναζήτηση';
 $labels['aclr'] = 'Διαβάστε τα μηνύματα ';
-$labels['acls'] = 'Κρατήστε Επίσκεψη κατάσταση';
-$labels['aclw'] = 'Δημιουργια σημαιων';
+$labels['acls'] = 'Διατήρηση κατάστασης ανάγνωσης';
+$labels['aclw'] = 'Ρυθμίσεις εγγραφής';
 $labels['acli'] = 'Εισάγωγη (Αντιγραφή σε) ';
 $labels['aclp'] = 'Καταχώρηση';
-$labels['aclc'] = 'Δημιουργια υποφακελων';
-$labels['aclk'] = 'Δημιουργια υποφακελων';
+$labels['aclc'] = 'Δημιουργία υποφακέλων';
+$labels['aclk'] = 'Δημιουργία υποφακέλων';
 $labels['acld'] = 'Διαγραφή μηνυμάτων';
 $labels['aclt'] = 'Διαγραφή μηνυμάτων';
-$labels['acle'] = 'Απαλειψη';
+$labels['acle'] = 'Απαλοιφή';
 $labels['aclx'] = 'Διαγραφή φακέλου';
-$labels['acla'] = 'Χορηγος';
-$labels['aclfull'] = 'Πληρης ελεγχος';
-$labels['aclother'] = 'Άλλα';
-$labels['aclread'] = 'Αναγνωση';
-$labels['aclwrite'] = 'Δημιουργια';
+$labels['acla'] = 'Διαχείριση';
+$labels['acln'] = 'Προσθήκη υπομνήματος στα μηνύματα';
+$labels['aclfull'] = 'Πλήρης πρόσβαση';
+$labels['aclother'] = 'Άλλο';
+$labels['aclread'] = 'Ανάγνωση';
+$labels['aclwrite'] = 'Εγγραφή';
 $labels['acldelete'] = 'Διαγραφή';
 $labels['shortacll'] = 'Αναζήτηση';
-$labels['shortaclr'] = 'Αναγνωση';
-$labels['shortacls'] = 'Κρατηση';
-$labels['shortaclw'] = 'Δημιουργια';
-$labels['shortacli'] = 'Αντιστροφη';
-$labels['shortaclp'] = 'Καταχωρηση';
+$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['shortacle'] = 'Απαλοιφή';
+$labels['shortaclx'] = 'Διαγραφή φακέλου';
+$labels['shortacla'] = 'Διαχείριση';
+$labels['shortacln'] = 'Προσθήκη υπομνήματος';
+$labels['shortaclother'] = 'Άλλο';
+$labels['shortaclread'] = 'Ανάγνωση';
+$labels['shortaclwrite'] = 'Εγγραφή';
 $labels['shortacldelete'] = 'Διαγραφή';
-$labels['longacll'] = 'Ο φάκελος είναι ορατος στης λιστες και μπορεί να εγγραφεί';
-$labels['longaclr'] = 'Ο φάκελος μπορεί να ανοίξει για την ανάγνωση ';
-$labels['longacls'] = 'Η σημαια μυνηματων μπορει να αλλαχθει';
-$labels['longaclw'] = 'Μηνύματα σημαίες και λέξεις-κλειδιά που μπορεί να αλλάξει, εκτός δει και διαγράφεται ';
-$labels['longacli'] = 'Τα μηνύματα μπορούν να γραφθουν ή να αντιγραφθούν στο φάκελο ';
+$labels['longacll'] = 'Ο φάκελος είναι ορατός στους καταλόγους και μπορείτε να εγγραφείτε σε αυτόν';
+$labels['longaclr'] = 'Ο φάκελος μπορεί να προσπελαστεί για ανάγνωση ';
+$labels['longacls'] = 'Η κατάσταση ανάγνωσης μηνυμάτων μπορεί να αλλαχθεί';
+$labels['longaclw'] = 'Μπορούν να μεταβληθούν οι καταστάσεις μηνυμάτων και οι λέξεις κλειδιά, εκτός από τις καταστάσεις Ανάγνωσης και Διαγραφής';
+$labels['longacli'] = 'Τα μηνύματα μπορούν να εγγραφούν ή να αντιγραφούν στον φάκελο ';
 $labels['longaclp'] = 'Τα μηνύματα μπορούν να τοποθετηθούν σε αυτόν το φάκελο ';
-$labels['longaclc'] = 'Μπορούν να δημιουργηθούν φάκελοι (ή να μετονομαστουν ) ακριβώς κάτω από αυτόν το φάκελο ';
-$labels['longaclk'] = 'Μπορούν να δημιουργηθούν φάκελοι (ή να μετονομαστουν ) ακριβώς κάτω από αυτόν το φάκελο ';
-$labels['longacld'] = 'Διαγραφή μηνυμάτων σημαίας μπορεί να αλλάξει ';
-$labels['longaclt'] = 'Διαγραφή μηνυμάτων σημαίας μπορεί να αλλάξει ';
-$labels['longacle'] = 'Μυνηματα που μπορουν να απαλειφθουν';
-$labels['longaclx'] = 'Ο φακελος δεν μπορει να μετονομασθει η να διαγραφθει';
-$labels['longacla'] = 'Τα δικαιώματα πρόσβασης στο φάκελο και μπορεί να αλλάξει';
-$labels['longaclfull'] = 'Πλήρης έλεγχος συμπεριλαμβανομένης της διοίκησης ';
-$labels['longaclread'] = 'Ο φάκελος μπορεί να ανοίξει για την ανάγνωση ';
-$labels['longaclwrite'] = 'Μηνύματα να σημαδεύονται, γραπτή ή αντιγράφονται στο φάκελο';
-$labels['longacldelete'] = 'Τα μυνηματα μπορουν να διαγραφθουν';
+$labels['longaclc'] = 'Μπορούν να δημιουργηθούν (ή να μετονομαστούν) φάκελοι ακριβώς κάτω από αυτόν τον φάκελο ';
+$labels['longaclk'] = 'Μπορούν να δημιουργηθούν (ή να μετονομαστούν) φάκελοι ακριβώς κάτω από αυτόν τον φάκελο ';
+$labels['longacld'] = 'Η κατάσταση διαγραφής μηνυμάτων μπορεί να μεταβληθεί';
+$labels['longaclt'] = 'Η κατάσταση διαγραφής μηνυμάτων μπορεί να μεταβληθεί';
+$labels['longacle'] = 'Τα μηνύματα μπορούν να απαλειφθούν';
+$labels['longaclx'] = 'Ο φάκελος μπορεί να μετονομασθεί ή να διαγραφεί';
+$labels['longacla'] = 'Τα δικαιώματα πρόσβασης στον φάκελο μπορούν να μεταβληθούν';
+$labels['longacln'] = 'Το διαμοιραζόμενο υπόμνημα των μηνυμάτων είναι δυνατό να μεταβληθεί';
+$labels['longaclfull'] = 'Πλήρης έλεγχος συμπεριλαμβανόμενης της διαχείρισης φακέλων';
+$labels['longaclread'] = 'Ο φάκελος είναι δυνατό να προσπελαστεί για ανάγνωση';
+$labels['longaclwrite'] = 'Τα μηνύματα μπορούν να σημαδεύονται, να εγγράφονται ή να αντιγράφονται στον φάκελο';
+$labels['longacldelete'] = 'Τα μηνύματα μπορούν να διαγραφούν';
+$labels['longaclother'] = 'Άλλα δικαιώματα πρόσβασης';
+$labels['ariasummaryacltable'] = 'Λίστα δικαιωμάτων πρόσβασης';
+$labels['arialabelaclactions'] = 'Λίστα ενεργειών';
+$labels['arialabelaclform'] = 'Φόρμα δικαιωμάτων πρόσβασης';
 $messages['deleting'] = 'Διαγραφή των δικαιωμάτων πρόσβασης...';
 $messages['saving'] = 'Αποθήκευση δικαιώματων πρόσβασης...';
-$messages['updatesuccess'] = 'Άλλαξε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['deletesuccess'] = 'Διαγράφηκε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['createsuccess'] = 'Προστέθηκε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['updateerror'] = 'Δεν είναι δυνατή η ενημέρωση δικαιωμάτων πρόσβασης';
+$messages['updatesuccess'] = 'Επιτυχής μεταβολή των δικαιωμάτων πρόσβασης';
+$messages['deletesuccess'] = 'Επιτυχής διαγραφή των δικαιωμάτων πρόσβασης';
+$messages['createsuccess'] = 'Επιτυχής προσθήκη δικαιωμάτων πρόσβασης';
+$messages['updateerror'] = 'Δεν είναι δυνατή η ενημέρωση των δικαιωμάτων πρόσβασης';
 $messages['deleteerror'] = 'Δεν είναι δυνατή η διαγραφή των δικαιωμάτων πρόσβασης ';
-$messages['createerror'] = 'Δεν είναι δυνατή η προσθήκη δικαιώματα πρόσβασης ';
-$messages['deleteconfirm'] = 'Είσαι σίγουρος, ότι θέλετε να καταργήσετε τα δικαιώματα πρόσβασης του επιλεγμένου(ων) χρήστης ';
-$messages['norights'] = 'Κανένα δικαίωμα έχει καθοριστεί';
-$messages['nouser'] = 'Το όνομα δεν έχει καθοριστεί! ';
+$messages['createerror'] = 'Δεν είναι δυνατή η προσθήκη δικαιωμάτων πρόσβασης ';
+$messages['deleteconfirm'] = 'Είστε βέβαιοι ότι θέλετε να καταργήσετε τα δικαιώματα πρόσβασης του επιλεγμένου(ων) χρήστη(ών);';
+$messages['norights'] = 'Κανένα δικαίωμα δεν έχει καθοριστεί!';
+$messages['nouser'] = 'Το όνομα χρήστη δεν έχει καθοριστεί! ';
 ?>

plugins/acl/localization/en_CA.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+$labels['longacln'] = 'Messages shared metadata (annotations) can be changed';
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';

plugins/acl/localization/en_GB.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+$labels['longacln'] = 'Messages shared metadata (annotations) can be changed';
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Messages can be deleted';
+$labels['longaclother'] = 'Other access rights';
+$labels['ariasummaryacltable'] = 'List of access rights';
+$labels['arialabelaclactions'] = 'List actions';
+$labels['arialabelaclform'] = 'Access rights form';
 $messages['deleting'] = 'Deleting access rights...';
 $messages['saving'] = 'Saving access rights...';
 $messages['updatesuccess'] = 'Successfully changed access rights';

plugins/acl/localization/en_US.inc

@@ -19,8 +19,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -39,6 +40,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
@@ -59,6 +61,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
@@ -78,6 +81,7 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+$labels['longacln'] = 'Messages shared metadata (annotations) can be changed';
 
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';

plugins/acl/localization/eo.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
-$labels['advanced'] = 'progresinta reĝimo';
 $labels['newuser'] = 'Aldoni eron';
 $labels['actions'] = 'Agoj de atingrajtoj...';
 $labels['anyone'] = 'Ĉiuj uzantoj (iu ajn)';

plugins/acl/localization/es_419.inc

@@ -15,36 +15,84 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
+$labels['sharing'] = 'Compartiendo';
+$labels['myrights'] = 'Derechos de acceso';
 $labels['username'] = 'Usuario:';
-$labels['advanced'] = 'modo avanzado';
+$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
-$labels['anyone'] = 'Todos los usuarios ';
-$labels['anonymous'] = 'Invitados (anonimos)';
+$labels['editperms'] = 'Editar permisos';
+$labels['actions'] = 'Acciones de derecho de acceso...';
+$labels['anyone'] = 'Todos los usuarios (cualquiera)';
+$labels['anonymous'] = 'Invitados (anónimos)';
 $labels['identifier'] = 'Identificador';
-$labels['acll'] = 'Busqueda';
+$labels['acll'] = 'Búsqueda';
 $labels['aclr'] = 'Leer mensajes';
+$labels['acls'] = 'Mantener estado de visto';
+$labels['aclw'] = 'Etiquetas de escritura';
 $labels['acli'] = 'Insertar (copiar a)';
+$labels['aclp'] = 'Publicar';
 $labels['aclc'] = 'Crear subcarpetas';
-$labels['aclk'] = 'crear subcarpetas';
-$labels['acld'] = 'Eliminar mensaje';
+$labels['aclk'] = 'Crear subcarpetas';
+$labels['acld'] = 'Eliminar mensajes';
 $labels['aclt'] = 'Eliminar mensajes';
+$labels['acle'] = 'Borrar';
 $labels['aclx'] = 'Eliminar carpeta';
+$labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
+$labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
 $labels['aclwrite'] = 'Escribir';
 $labels['acldelete'] = 'Eliminar';
-$labels['shortacll'] = 'Busqueda';
+$labels['shortacll'] = 'Búsqueda';
 $labels['shortaclr'] = 'Leer';
+$labels['shortacls'] = 'Mantener';
 $labels['shortaclw'] = 'Escribir';
 $labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
 $labels['shortacld'] = 'Eliminar';
 $labels['shortaclt'] = 'Eliminar';
+$labels['shortacle'] = 'Borrar';
+$labels['shortaclx'] = 'Eliminar carpeta';
+$labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
 $labels['shortacldelete'] = 'Eliminar';
+$labels['longacll'] = 'La carpeta es visible en listas y se la puede suscribir';
 $labels['longaclr'] = 'La carpeta puede ser abierta para lectura';
+$labels['longacls'] = 'Etiqueta de mensajes leídos puede ser cambiada';
+$labels['longaclw'] = 'Las etiquetas de mensajes y palabras clave puede ser cambiada, excepto Leídos y Eliminados';
 $labels['longacli'] = 'Se pueden escribir o copiar mensajes a la carpeta';
+$labels['longaclp'] = 'Los mensajes pueden ser publicados en esta carpeta';
+$labels['longaclc'] = 'Las carpetas pueden ser creadas (o renombradas) directamente desde esta carpeta';
+$labels['longaclk'] = 'Las carpetas pueden ser creadas (o renombradas) directamente desde esta carpeta';
+$labels['longacld'] = 'La etiqueta de mensajes eliminados puede ser cambiada';
+$labels['longaclt'] = 'La etiqueta de mensajes eliminados puede ser cambiada';
+$labels['longacle'] = 'Los mensajes pueden ser borrados';
+$labels['longaclx'] = 'La carpeta puede ser eliminada o renombrada';
+$labels['longacla'] = 'Los derechos de acceso de la carpeta pueden ser cambiados';
+$labels['longacln'] = 'Los metadatos compartidos de los mensajes (anotaciones) puede ser cambiado';
+$labels['longaclfull'] = 'Control total incluyendo administración de carpetas';
+$labels['longaclread'] = 'La carpeta puede ser abierta para lectura';
+$labels['longaclwrite'] = 'Los mensajes pueden ser marcados, escritos o copiados a la carpeta';
+$labels['longacldelete'] = 'Los mensajes pueden ser eliminados';
+$labels['longaclother'] = 'Otros derechos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de derechos de acceso';
+$labels['arialabelaclactions'] = 'Listar acciones';
+$labels['arialabelaclform'] = 'Formulario de derechos de acceso';
+$messages['deleting'] = 'Derechos de acceso de eliminación...';
+$messages['saving'] = 'Guardando derechos de acceso...';
+$messages['updatesuccess'] = 'Se han cambiado los derechos de acceso exitosamente';
+$messages['deletesuccess'] = 'Se han eliminado los derechos de acceso exitosamente';
+$messages['createsuccess'] = 'Se han agregado los derechos de acceso exitosamente';
+$messages['updateerror'] = 'No es posible actualizar los derechos de acceso';
+$messages['deleteerror'] = 'No es posible eliminar los derechos de acceso';
+$messages['createerror'] = 'No es posible agregar los derechos de acceso';
+$messages['deleteconfirm'] = '¿Estás seguro de que deseas eliminar los derechos de acceso a usuario(s) seleccionado(s)?';
+$messages['norights'] = '¡No se hace especificado un derecho!';
+$messages['nouser'] = '¡No se ha especificado un nombre de usuario!';
 ?>

plugins/acl/localization/es_AR.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Compartiendo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
-$labels['advanced'] = 'modo avanzado';
+$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Acciones para los permisos de acceso...';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitado (anonimo)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Eliminar mensajes';
 $labels['acle'] = 'Descartar';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Eliminar';
 $labels['shortacle'] = 'Descartar';
 $labels['shortaclx'] = 'Borrado de carpeta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
@@ -72,15 +75,21 @@ $labels['longaclt'] = 'El marcador de Mensaje Eliminado puede ser modificado';
 $labels['longacle'] = 'Los mensajes pueden ser descartados';
 $labels['longaclx'] = 'La carpeta puede ser eliminada o renombrada';
 $labels['longacla'] = 'Los permisos de acceso de esta carpeta pueden ser modificados';
+$labels['longacln'] = 'La metainformación de mensajes compartidos (anotaciones) puede ser cambiada';
 $labels['longaclfull'] = 'Control total incluyendo la administracion de carpeta';
 $labels['longaclread'] = 'La carpeta se puede abrir para lectura';
 $labels['longaclwrite'] = 'En esta carpeta los mensajes pueden ser marcados, escritos o copiados';
 $labels['longacldelete'] = 'Los mensajes se pueden eliminar';
+$labels['longaclother'] = 'Otros permisos de acceso';
+$labels['ariasummaryacltable'] = 'Listado de permisos de acceso';
+$labels['arialabelaclactions'] = 'Listar acciones';
+$labels['arialabelaclform'] = 'Formulario de permisos de acceso';
 $messages['deleting'] = 'Eliminando permisos de acceso...';
 $messages['saving'] = 'Salvando permisos de acceso...';
 $messages['updatesuccess'] = 'Permisos de acceso modificados satisfactoriamente';
 $messages['deletesuccess'] = 'Permisos de acceso eliminados correctamente';
 $messages['createsuccess'] = 'Permisos de acceso agregados satisfactoriamente';
+$messages['updateerror'] = 'No se pudieron actualizar los permisos de acceso';
 $messages['deleteerror'] = 'No se pueden eliminar los permisos de acceso';
 $messages['createerror'] = 'No se pueden agregar los permisos de acceso';
 $messages['deleteconfirm'] = 'Estas seguro que queres remover los permisos de acceso a el/los usuario(s) seleccionado/s?';

plugins/acl/localization/es_ES.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
 $labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Añadir una entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Acciones sobre los permisos de acceso…';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Borrar mensajes';
 $labels['acle'] = 'Expurgar';
 $labels['aclx'] = 'Borrar carpeta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Borrar';
 $labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Borrar carpeta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Los metadatos compartidos de los mensajes (anotaciones) pueden cambiarse';
 $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['longaclother'] = 'Otros derechos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de derechos de acceso';
+$labels['arialabelaclactions'] = 'Lista de acciones';
+$labels['arialabelaclform'] = 'Formulario de derechos de acceso';
 $messages['deleting'] = 'Borrando permisos de acceso…';
 $messages['saving'] = 'Guardando permisos de acceso…';
 $messages['updatesuccess'] = 'Se han cambiado los permisos de acceso';

plugins/acl/localization/et_EE.inc

@@ -20,11 +20,15 @@ $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
 $labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['editperms'] = 'Muuda õigusi';
 $labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
 $labels['identifier'] = 'Tuvastaja';
+$labels['acll'] = 'Ülevaade';
 $labels['aclr'] = 'Lugeda kirju';
+$labels['acls'] = 'Hoia nähtud olekut';
+$labels['aclw'] = 'Salvesta lipud';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
@@ -34,11 +38,13 @@ $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
+$labels['acln'] = 'Annoteeri kirja';
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
+$labels['shortacll'] = 'Ülevaade';
 $labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
 $labels['shortaclw'] = 'Kirjuta';
@@ -51,20 +57,33 @@ $labels['shortaclt'] = 'Kustuta';
 $labels['shortacle'] = 'Eemalda';
 $labels['shortaclx'] = 'Kausta kustutamine';
 $labels['shortacla'] = 'Administreerida';
+$labels['shortacln'] = 'Annoteeri';
 $labels['shortaclother'] = 'Muu';
 $labels['shortaclread'] = 'Loe';
 $labels['shortaclwrite'] = 'Kirjuta';
 $labels['shortacldelete'] = 'Kustuta';
 $labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
+$labels['longacls'] = 'Kirja loetuse lippu saab muuta';
+$labels['longaclw'] = 'Kirja lippe ja otsingusõnu saab muuta, väljaarvatud loetud ja kustutatud';
+$labels['longacli'] = 'Kirju saab salvestada ja kopeerida antud kausta';
+$labels['longaclp'] = 'Kirju saab postitada antud kausta';
+$labels['longaclc'] = 'Kaustasi saab luua (või ümber nimetada) otse siia kausta alla.';
+$labels['longaclk'] = 'Kaustu saab luua (või ümber nimetada) otse siia kausta alla';
 $labels['longacld'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longaclt'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longacle'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
 $labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
+$labels['longacln'] = 'Kirja jagatud metainfot (annotatsioonid) saab muuta';
 $labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
 $labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$labels['longaclwrite'] = 'Kirju saab märgistada, salvestada või kopeerida kausta';
 $labels['longacldelete'] = 'Kirju saab kustutada';
+$labels['longaclother'] = 'Muud ligipääsu õigused';
+$labels['ariasummaryacltable'] = 'Nimekir ligipääsu õigustest';
+$labels['arialabelaclactions'] = 'Näita tegevusi';
+$labels['arialabelaclform'] = 'Ligipääsu õiguste vorm';
 $messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
 $messages['saving'] = 'Ligipääsuõiguste salvestamine...';
 $messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';

plugins/acl/localization/eu_ES.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Sarbide-eskubideak';
 $labels['username'] = 'Erabiltzailea:';
 $labels['advanced'] = 'modu aurreratua';
 $labels['newuser'] = 'Gehitu sarrera';
+$labels['editperms'] = 'Editatu baimenak';
 $labels['actions'] = 'Sarbide-eskubideen ekintzak...';
 $labels['anyone'] = 'Erabiltzaile guztiak (edozein)';
 $labels['anonymous'] = 'Gonbidatuak (anonimo)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ezabatu mezuak';
 $labels['acle'] = 'Kendu';
 $labels['aclx'] = 'Ezabatu karpeta';
 $labels['acla'] = 'Administratu';
+$labels['acln'] = 'Idatzi mezuak';
 $labels['aclfull'] = 'Kontrol osoa';
 $labels['aclother'] = 'Beste';
 $labels['aclread'] = 'Irakurri';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Ezabatu';
 $labels['shortacle'] = 'Kendu';
 $labels['shortaclx'] = 'Ezabatu karpeta';
 $labels['shortacla'] = 'Administratu';
+$labels['shortacln'] = 'Idatzi';
 $labels['shortaclother'] = 'Beste';
 $labels['shortaclread'] = 'Irakurri';
 $labels['shortaclwrite'] = 'Idatzi';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Mezuen ezabatu bandera alda daiteke';
 $labels['longacle'] = 'Mezuak betiko ezaba daitezke';
 $labels['longaclx'] = 'Karpeta ezaba edo berrizenda daiteke';
 $labels['longacla'] = 'Karpetaren sarbide eskubideak alda daitezke';
+$labels['longacln'] = 'Partekatutatko mezuen metadatuak (oharrak) alda daitezke';
 $labels['longaclfull'] = 'Kontrol osoa, karpetaren administrazioa barne';
 $labels['longaclread'] = 'Karpeta ireki daiteke irakurtzeko';
 $labels['longaclwrite'] = 'Mezuak marka, idatzi edo kopia daitezke karpetara';
 $labels['longacldelete'] = 'Mezuak ezaba daitezke';
+$labels['longaclother'] = 'Beste sarbide-eskubideak';
+$labels['ariasummaryacltable'] = 'Sarbide-eskubideen zerrenda';
+$labels['arialabelaclactions'] = 'Zerrendatu ekintzak';
+$labels['arialabelaclform'] = 'Sarbide-eskubideen formularioa';
 $messages['deleting'] = 'Sarbide-eskubideak ezabatzen...';
 $messages['saving'] = 'Sarbide-eskubideak gordetzen...';
 $messages['updatesuccess'] = 'Sarbide-eskubideak ongi aldatu dira';

plugins/acl/localization/fa_AF.inc

@@ -0,0 +1,26 @@
+<?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['username'] = 'کاربر:';
+$labels['newuser'] = 'افزودن مدخل';
+$labels['aclw'] = 'نوشتن نشانه ها';
+$labels['aclp'] = 'ارسال';
+$labels['acla'] = 'مدیر';
+$labels['aclfull'] = 'کنترل کامل';
+$labels['aclother'] = 'دیگر';
+?>

plugins/acl/localization/fa_IR.inc

@@ -16,11 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'اشتراک‌گذاری';
-$labels['myrights'] = 'مجوزهای دسترسی';
+$labels['myrights'] = 'حقوق دسترسی';
 $labels['username'] = 'کاربر:';
 $labels['advanced'] = 'حالت پیشرفته';
-$labels['newuser'] = 'افزودن مدخل';
-$labels['actions'] = 'فعالیت‌های مجوز دسترسی...';
+$labels['newuser'] = 'افزودن ورودی';
+$labels['editperms'] = 'ویرایش مجوزها';
+$labels['actions'] = 'فعالیت‌های حق دسترسی...';
 $labels['anyone'] = 'همه‌ی کاربران (هر کسی)';
 $labels['anonymous'] = 'مهمان‌ها (ناشناس)';
 $labels['identifier'] = 'شناساگر';
@@ -28,39 +29,41 @@ $labels['acll'] = 'یافتن';
 $labels['aclr'] = 'پیغام‌های خوانده شده';
 $labels['acls'] = 'نگه داشتن حالت بازدید';
 $labels['aclw'] = 'پرچم‌های نوشتن';
-$labels['acli'] = 'وارد کردن (کپی کردن در)';
-$labels['aclp'] = 'ارسال';
+$labels['acli'] = 'وارد کردن (رونوشت در)';
+$labels['aclp'] = 'نوشته';
 $labels['aclc'] = 'ایجاد زیرپوشه‌ها';
 $labels['aclk'] = 'ایجاد زیرپوشه‌ها';
-$labels['acld'] = 'پاک کردن پیغام‌ها';
-$labels['aclt'] = 'پاک کردن پیغام‌ها';
+$labels['acld'] = 'حذف پیغام‌ها';
+$labels['aclt'] = 'حذف پیغام‌ها';
 $labels['acle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
-$labels['acla'] = 'مدیریت کردن';
+$labels['acla'] = 'اداره کردن';
+$labels['acln'] = 'حاشیه نویسی پیغام ها';
 $labels['aclfull'] = 'کنترل کامل';
 $labels['aclother'] = 'دیگر';
 $labels['aclread'] = 'خواندن';
 $labels['aclwrite'] = 'نوشتن';
-$labels['acldelete'] = 'حذف';
+$labels['acldelete'] = 'حذف کردن';
 $labels['shortacll'] = 'یافتن';
 $labels['shortaclr'] = 'خواندن';
 $labels['shortacls'] = 'نگه داشتن';
 $labels['shortaclw'] = 'نوشتن';
-$labels['shortacli'] = 'اضافه کردن';
-$labels['shortaclp'] = 'ارسال';
+$labels['shortacli'] = 'جاگذارى';
+$labels['shortaclp'] = 'پست کردن';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
 $labels['shortacld'] = 'حذف';
 $labels['shortaclt'] = 'حذف';
 $labels['shortacle'] = 'پاک کردن';
-$labels['shortaclx'] = 'حذف کردن پوشه';
-$labels['shortacla'] = 'مدیریت کردن';
+$labels['shortaclx'] = 'حذف پوشه';
+$labels['shortacla'] = 'اداره کردن';
+$labels['shortacln'] = 'حاشیه نویسی';
 $labels['shortaclother'] = 'دیگر';
 $labels['shortaclread'] = 'خواندن';
 $labels['shortaclwrite'] = 'نوشتن';
-$labels['shortacldelete'] = 'حذف';
-$labels['longacll'] = 'پوشه را می‌توان در فهرست‌ها دید و در آن مشترک شد';
-$labels['longaclr'] = 'پوشه می‌تواند برای خوانده شدن باز شود';
+$labels['shortacldelete'] = 'حذف کردن';
+$labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک آن شد';
+$labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف';
 $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه';
@@ -71,20 +74,21 @@ $labels['longacld'] = 'پرچم حذف پیغام‌ها می‌تواند تغ
 $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
-$labels['longacla'] = 'قوانین دسترسی پوشه می‌تواند تغییر داده شود';
+$labels['longacla'] = 'حقوق دسترسی پوشه می‌تواند تغییر داده شود';
+$labels['longacln'] = 'اطلاعات متا اشتراک گذاشته شده پیغام‌ها (حاشیه‌ها) می‌تواند تغییر داده شوند';
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
 $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['deleting'] = 'حذف کردن حقوق دسترسی...';
+$messages['saving'] = 'ذخیره حقوق دسترسی...';
+$messages['updatesuccess'] = 'حقوق دسترسی با موفقیت تغییر کردند';
+$messages['deletesuccess'] = 'حقوق دسترسی با موفقیت حذف شدند';
+$messages['createsuccess'] = 'حقوق دسترسی با موفقیت اضافه شدند';
+$messages['updateerror'] = 'ناتوانی در روزآمد کردن حقوق دسترسی';
+$messages['deleteerror'] = 'ناتوانی در حذف حقوق دسترسی';
+$messages['createerror'] = 'ناتوانی در اضافه کردن حقوق دسترسی';
+$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید حقوق دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$messages['norights'] = 'هیچ حقی مشخص نشده است!';
 $messages['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 ?>

plugins/acl/localization/fi_FI.inc

@@ -18,15 +18,27 @@
 $labels['sharing'] = 'Jakaminen';
 $labels['myrights'] = 'Käyttöoikeudet';
 $labels['username'] = 'Käyttäjä:';
-$labels['advanced'] = 'edistynyt tila';
+$labels['editperms'] = 'Muokkaa oikeuksia';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
+$labels['aclc'] = 'Luo alikansioita';
+$labels['aclk'] = 'Luo alikansioita';
+$labels['acld'] = 'Poista viestejä';
+$labels['aclt'] = 'Poista viestejä';
+$labels['aclx'] = 'Poista kansio';
+$labels['aclfull'] = 'Täydet käyttöoikeudet';
 $labels['aclother'] = 'Muu';
+$labels['aclread'] = 'Luku';
+$labels['aclwrite'] = 'Kirjoitus';
+$labels['acldelete'] = 'Poisto';
 $labels['shortaclc'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
 $labels['shortacld'] = 'Poista';
 $labels['shortaclt'] = 'Poista';
 $labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Luku';
+$labels['shortaclwrite'] = 'Kirjoitus';
+$labels['shortacldelete'] = 'Poisto';
 $labels['longaclr'] = 'Kansion voi avata lukua varten';
 $labels['longaclx'] = 'Kansio voidaan poistaa tai nimetä uudelleen';
 $labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';

plugins/acl/localization/fo_FO.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Deiling';
 $labels['myrights'] = 'Atgongdar-rættindi';
 $labels['username'] = 'Brúkari:';
-$labels['advanced'] = 'Framkomin støða';
+$labels['advanced'] = 'Víðkað útgáva';
 $labels['newuser'] = 'Legg inn';
+$labels['editperms'] = 'Broyt atgonguloyvi';
 $labels['actions'] = 'Stillingar til atgongu-rættindi';
 $labels['anyone'] = 'Allir brúkarir (øll)';
 $labels['anonymous'] = 'Gestir (dulnevnd)';

plugins/acl/localization/fr_FR.inc

@@ -20,16 +20,17 @@ $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
 $labels['advanced'] = 'Mode avancé';
 $labels['newuser'] = 'Ajouter l\'entrée';
-$labels['actions'] = 'Action sur les droits d\'accès...';
-$labels['anyone'] = 'Tous les utilisateurs (tout le monde)';
-$labels['anonymous'] = 'Invités (anonymes)';
+$labels['editperms'] = 'Modifier les permissions';
+$labels['actions'] = 'Actions des droits d\'accès...';
+$labels['anyone'] = 'Tous les utilisateurs (n\'importe qui)';
+$labels['anonymous'] = 'Invités (anonyme)';
 $labels['identifier'] = 'Identifiant';
 $labels['acll'] = '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['acls'] = 'Garder l\'état « vu »';
+$labels['aclw'] = 'Drapeaux d\'écriture';
+$labels['acli'] = 'Insérer (copier dans)';
+$labels['aclp'] = 'Publier';
 $labels['aclc'] = 'Créer des sous-dossiers';
 $labels['aclk'] = 'Créer des sous-dossiers';
 $labels['acld'] = 'Supprimer des messages';
@@ -37,54 +38,61 @@ $labels['aclt'] = 'Supprimer des messages';
 $labels['acle'] = 'Purger';
 $labels['aclx'] = 'Supprimer un dossier';
 $labels['acla'] = 'Administrer';
+$labels['acln'] = 'Annoter les messages';
 $labels['aclfull'] = 'Contrôle total';
 $labels['aclother'] = 'Autre';
 $labels['aclread'] = 'Lecture';
 $labels['aclwrite'] = 'Écriture';
-$labels['acldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['acldelete'] = 'Supprimer';
 $labels['shortacll'] = 'Consultation';
 $labels['shortaclr'] = 'Lecture';
 $labels['shortacls'] = 'Conserver';
 $labels['shortaclw'] = 'Écriture';
 $labels['shortacli'] = 'Insérer';
-$labels['shortaclp'] = 'Envoyer';
+$labels['shortaclp'] = 'Publier';
 $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['shortacld'] = 'Supprimer';
+$labels['shortaclt'] = 'Supprimer';
 $labels['shortacle'] = 'Purger';
-$labels['shortaclx'] = 'Supprimer un dossier';
+$labels['shortaclx'] = 'Suppression de dossier';
 $labels['shortacla'] = 'Administrer';
+$labels['shortacln'] = 'Annoter';
 $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['longacls'] = 'L\'étiquette Lu peut-être changée';
-$labels['longaclw'] = 'Les étiquettes et les mot-clés peuvent-être changé, sauf pour Vu et Supprimé';
-$labels['longacli'] = 'Les messages peuvent-être écrit ou copié dans le dossier';
-$labels['longaclp'] = 'Les messages peuvent-être envoyé dans ce dossier';
-$labels['longaclc'] = 'Les dossiers peuvent-être créer (ou renommer) directement depuis ce dossier';
-$labels['longaclk'] = 'Les dossiers peuvent-être créer (ou renommer) directement depuis ce dossier';
-$labels['longacld'] = 'L\'étiquette de suppression des messages peut-être modifiée';
-$labels['longaclt'] = 'L\'étiquette de suppression des messages peut-être modifiée';
+$labels['shortacldelete'] = 'Supprimer';
+$labels['longacll'] = 'Ce dossier est visible dans les listes et on peut s\'y abonner';
+$labels['longaclr'] = 'Le dossier peut-être ouvert en lecture';
+$labels['longacls'] = 'Le drapeau Vu des messages peut-être changée';
+$labels['longaclw'] = 'Les drapeaux et mot-clefs des messages peuvent-être changés, sauf pour Vu et Supprimé';
+$labels['longacli'] = 'Les messages peuvent-être écrits ou copiés dans le dossier';
+$labels['longaclp'] = 'Les messages peuvent-être publiés dans ce dossier';
+$labels['longaclc'] = 'Les dossiers peuvent-être créés (ou renommés) directement depuis ce dossier';
+$labels['longaclk'] = 'Les dossiers peuvent-être créés (ou renommés) directement depuis ce dossier';
+$labels['longacld'] = 'Le drapeau de suppression des messages peut-être modifiée';
+$labels['longaclt'] = 'Le drapeau de suppression des messages peut-être modifiée';
 $labels['longacle'] = 'Les messages peuvent-être purgés';
 $labels['longaclx'] = 'Le dossier peut-être supprimé ou renommé';
-$labels['longacla'] = 'Les droits d\'accès au dossier peuvent-être modifiés';
-$labels['longaclfull'] = 'Contrôle total, dossier d\'administration inclus';
-$labels['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['longacla'] = 'Les droits d\'accès du dossier peuvent être modifiés';
+$labels['longacln'] = 'Les métadonnées partagées par les messages (annotations) peuvent être changées';
+$labels['longaclfull'] = 'Contrôle total, incluant l\'administration des dossiers';
+$labels['longaclread'] = 'Le dossier peut-être ouvert en lecture';
+$labels['longaclwrite'] = 'Les messages peuvent-être marqués, écrits ou copiés dans ce dossier';
+$labels['longacldelete'] = 'Les messages peuvent être supprimés';
+$labels['longaclother'] = 'Autres droits d\'accès';
+$labels['ariasummaryacltable'] = 'Liste de droits d\'accès';
+$labels['arialabelaclactions'] = 'Lister les actions';
+$labels['arialabelaclform'] = 'Formulaire de droits d\'accès';
 $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['saving'] = 'Enregistrement des droits d\'accès…';
+$messages['updatesuccess'] = 'Les droits d\'accès ont été changés avec succès';
+$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimés avec succès';
+$messages['createsuccess'] = 'Les droits d\'accès ont été ajoutés 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é !';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès des utilisateurs sélectionnés ?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié !';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
 ?>

plugins/acl/localization/gl_ES.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Utente:';
 $labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Engadir entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Accións sobre os Permisos de acceso...';
 $labels['anyone'] = 'Todas as persoas usuarias (calquera)';
 $labels['anonymous'] = 'Persoas convidadas (anónimo)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Borrar mensaxes';
 $labels['acle'] = 'Expurga';
 $labels['aclx'] = 'Eliminar cartafol';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Crear anotacións para as mensaxes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Outros';
 $labels['aclread'] = 'Lectura';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Eliminar';
 $labels['shortacle'] = 'Expurga';
 $labels['shortaclx'] = 'Eliminar cartafol';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Crear anotación';
 $labels['shortaclother'] = 'Outros';
 $labels['shortaclread'] = 'Lectura';
 $labels['shortaclwrite'] = 'Escritura';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Pódense mudar as mensaxes coa marca Eliminar';
 $labels['longacle'] = 'As mensaxes poden ser expurgadas';
 $labels['longaclx'] = 'Pódese borrar ou renomear o cartafol';
 $labels['longacla'] = 'Pódense mudar os permisos de acceso ao cartafol';
+$labels['longacln'] = 'Pódense trocar as anotacións das mensaxes';
 $labels['longaclfull'] = 'Control total inclúe administración de cartafoles';
 $labels['longaclread'] = 'Pódese abrir o cartafol para lectura';
 $labels['longaclwrite'] = 'Pódense marcar, escribir ou copiar as mensaxes no cartafol';
 $labels['longacldelete'] = 'Pódense borrar as mensaxes';
+$labels['longaclother'] = 'Outros dereitos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de dereitos de acceso';
+$labels['arialabelaclactions'] = 'Accións de lista';
+$labels['arialabelaclform'] = 'Formulario de dereitos de acceso';
 $messages['deleting'] = 'Borrando permisos de acceso...';
 $messages['saving'] = 'Gardando permisos de acceso...';
 $messages['updatesuccess'] = 'Mudados con éxito os permisos de acceso';

plugins/acl/localization/he_IL.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
 $labels['advanced'] = 'מצב מתקדם';
 $labels['newuser'] = 'הוסף ערך';
+$labels['editperms'] = 'עריכת הרשאות';
 $labels['actions'] = 'פעולות על זכויות גישה...';
 $labels['anyone'] = 'כל המשתמשים (כל אחד)';
 $labels['anonymous'] = 'אורחים (אנונימי)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'מחיקת הודעות';
 $labels['acle'] = 'ניקוי רשומות שבוטלו';
 $labels['aclx'] = 'מחיקת תיקיה';
 $labels['acla'] = 'מנהל';
+$labels['acln'] = 'הוספה של הערת תיוג להודעות';
 $labels['aclfull'] = 'שליטה מלאה';
 $labels['aclother'] = 'אחר';
 $labels['aclread'] = 'קריאה';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'מחיקה';
 $labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['shortaclx'] = 'מחיקת תיקיה';
 $labels['shortacla'] = 'מנהל';
+$labels['shortacln'] = 'הוספה של הערת תיוג';
 $labels['shortaclother'] = 'אחר';
 $labels['shortaclread'] = 'קריאה';
 $labels['shortaclwrite'] = 'כתיבה';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'ניתן לשנות דגל נמחק של הודעות';
 $labels['longacle'] = 'ניתן לנקות הודעות שסומנו כמבוטלות';
 $labels['longaclx'] = 'ניתן למחוק תיקיה זו או לשנות שמה';
 $labels['longacla'] = 'ניתן לשנות זכויות גישה של תיקיה זו';
+$labels['longacln'] = 'ניתן לשנות הערות תיוג המשותפות להודעות';
 $labels['longaclfull'] = 'שליטה מלאה כולל ניהול התיקיה';
 $labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longaclwrite'] = 'ניתן לסמן, לכתוב או להעתיק הודעות לתיקיה זו';
 $labels['longacldelete'] = 'ניתן למחוק הודעות';
+$labels['longaclother'] = 'זכויות גישה אחרות';
+$labels['ariasummaryacltable'] = 'רשימת זכויות גישה';
+$labels['arialabelaclactions'] = 'רשימת פעולות';
+$labels['arialabelaclform'] = 'טופס זכויות גישה';
 $messages['deleting'] = 'זכויות גישה נמחקות...';
 $messages['saving'] = 'זכויות גישה נשמרות...';
 $messages['updatesuccess'] = 'זכויות גישה שונו בהצלחה';

plugins/acl/localization/hr_HR.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Dijeljenje';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
-$labels['advanced'] = 'Napredni način';
 $labels['newuser'] = 'Dodaj unos/pravilo';
 $labels['actions'] = 'Akcije prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (anyone)';

plugins/acl/localization/hu_HU.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
-$labels['advanced'] = 'Haladó beállítások';
+$labels['advanced'] = 'Haladó mód';
 $labels['newuser'] = 'Elem hozzáadása';
+$labels['editperms'] = 'Jogosultságok szerkesztése';
 $labels['actions'] = 'Hozzáférési jogok müveletei..';
 $labels['anyone'] = 'Minden felhasználó (bárki)';
 $labels['anonymous'] = 'Vendégek (névtelen)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Üzenetek törlése';
 $labels['acle'] = 'Törölt üzenetek eltávolítása';
 $labels['aclx'] = 'Mappa törlés';
 $labels['acla'] = 'Adminisztrátor';
+$labels['acln'] = 'Üzenetekhez címkézés';
 $labels['aclfull'] = 'Teljes hozzáférés';
 $labels['aclother'] = 'Egyéb';
 $labels['aclread'] = 'Olvasás';
@@ -55,6 +57,7 @@ $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['shortacln'] = 'Cimkézés';
 $labels['shortaclother'] = 'Egyéb';
 $labels['shortaclread'] = 'Olvasás';
 $labels['shortaclwrite'] = 'Írás';
@@ -72,6 +75,7 @@ $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['longacln'] = 'Üzenetek megosztott metaadatai(cimkéi) módosíthatoak';
 $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';

plugins/acl/localization/hy_AM.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Կիսվել';
 $labels['myrights'] = 'Մուտքի իրավունքներ';
 $labels['username'] = 'Օգտատեր`';
-$labels['advanced'] = 'Ընդլայնված տարբերակ';
 $labels['newuser'] = 'Ավելացնել գրառում';
 $labels['actions'] = 'Մուտքի իրավունքների գործողություններ…';
 $labels['anyone'] = 'Բոլոր օգտվողները (ցանկացած)';

plugins/acl/localization/id_ID.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
-$labels['advanced'] = 'mode canggih';
+$labels['advanced'] = 'Mode Lanjut';
 $labels['newuser'] = 'Tambahkan entri';
+$labels['editperms'] = 'Ubah izin';
 $labels['actions'] = 'Aksi hak akses...';
 $labels['anyone'] = 'Semua pengguna (siapa saja)';
 $labels['anonymous'] = 'Para tamu (anonim)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Hapus pesan';
 $labels['acle'] = 'Menghapus';
 $labels['aclx'] = 'Hapus folder';
 $labels['acla'] = 'Kelola';
+$labels['acln'] = 'Berikan keterangan pesan';
 $labels['aclfull'] = 'Kendali penuh';
 $labels['aclother'] = 'Lainnya';
 $labels['aclread'] = 'Baca';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Hapus';
 $labels['shortacle'] = 'Buang';
 $labels['shortaclx'] = 'Hapus folder';
 $labels['shortacla'] = 'Kelola';
+$labels['shortacln'] = 'Berikan keterangan';
 $labels['shortaclother'] = 'Lainnya';
 $labels['shortaclread'] = 'Baca';
 $labels['shortaclwrite'] = 'Tulis';
@@ -72,6 +75,7 @@ $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['longacln'] = 'Metadata pesan bersama (penjelasan) 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';

plugins/acl/localization/it_IT.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
-$labels['advanced'] = 'modalità avanzata';
+$labels['advanced'] = 'Modalità avanzata';
 $labels['newuser'] = 'Aggiungi voce';
+$labels['editperms'] = 'Modifica permessi';
 $labels['actions'] = 'Azioni permessi d\'accesso...';
 $labels['anyone'] = 'Tutti gli utenti';
 $labels['anonymous'] = 'Osptiti (anonimi)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Elimina messaggi';
 $labels['acle'] = 'Elimina';
 $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
+$labels['acln'] = 'Annota messaggi';
 $labels['aclfull'] = 'Controllo completo';
 $labels['aclother'] = 'Altro';
 $labels['aclread'] = 'Lettura';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Elimina';
 $labels['shortacle'] = 'Elimina';
 $labels['shortaclx'] = 'Elimina cartella';
 $labels['shortacla'] = 'Amministra';
+$labels['shortacln'] = 'Annota';
 $labels['shortaclother'] = 'Altro';
 $labels['shortaclread'] = 'Lettura';
 $labels['shortaclwrite'] = 'Scrittura';
@@ -72,10 +75,15 @@ $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['longacln'] = 'I metadati (annotazioni) dei messaggi condivisi possono essere modificati';
 $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione';
 $labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
 $labels['longacldelete'] = 'I messaggi possono essere eliminati';
+$labels['longaclother'] = 'Altri diritti di accesso';
+$labels['ariasummaryacltable'] = 'Elenco dei diritti di accesso';
+$labels['arialabelaclactions'] = 'Lista azioni';
+$labels['arialabelaclform'] = 'Modulo di accesso';
 $messages['deleting'] = 'Sto eliminando i diritti di accesso...';
 $messages['saving'] = 'Sto salvando i diritti di accesso...';
 $messages['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';

plugins/acl/localization/ja_JP.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
 $labels['advanced'] = '詳細なモード';
 $labels['newuser'] = '項目を追加';
+$labels['editperms'] = '編集の権限';
 $labels['actions'] = 'アクセス権の動作...';
 $labels['anyone'] = '(誰でも)すべてのユーザー';
 $labels['anonymous'] = 'ゲスト(匿名)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'メッセージを削除';
 $labels['acle'] = '抹消';
 $labels['aclx'] = 'フォルダーを削除';
 $labels['acla'] = '管理';
+$labels['acln'] = 'メッセージに注釈';
 $labels['aclfull'] = '完全な制御';
 $labels['aclother'] = 'その他';
 $labels['aclread'] = '読み込み';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = '削除';
 $labels['shortacle'] = '抹消';
 $labels['shortaclx'] = 'フォルダーの削除';
 $labels['shortacla'] = '管理';
+$labels['shortacln'] = '注釈';
 $labels['shortaclother'] = 'その他';
 $labels['shortaclread'] = '読み込み';
 $labels['shortaclwrite'] = '書き込み';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'メッセージの削除フラッグの変更を可能';
 $labels['longacle'] = 'メッセージの抹消を可能';
 $labels['longaclx'] = 'このフォルダーの削除や名前の変更を可能';
 $labels['longacla'] = 'フォルダーのアクセス権の変更を可能';
+$labels['longacln'] = 'メッセージの共有されるメタデータ(注釈)の変更を可能';
 $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を可能';
 $labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
 $labels['longacldelete'] = 'メッセージの削除を可能';
+$labels['longaclother'] = '他のアクセス権';
+$labels['ariasummaryacltable'] = 'アクセス権の一覧';
+$labels['arialabelaclactions'] = '動作を一覧';
+$labels['arialabelaclform'] = 'アクセス権の欄';
 $messages['deleting'] = 'アクセス権を削除中...';
 $messages['saving'] = 'アクセス権を保存中...';
 $messages['updatesuccess'] = 'アクセス権を変更しました。';

plugins/acl/localization/km_KH.inc

@@ -57,10 +57,16 @@ $labels['shortaclread'] = 'អាន';
 $labels['shortaclwrite'] = 'សរសេរ';
 $labels['shortacldelete'] = 'លុប';
 $labels['longaclr'] = 'ថត​នេះ​អាច​បើក​សម្រាប់​អាន';
+$labels['longacle'] = 'សារ​នេះ​អាច​ត្រូវ​បាន​ដក​ចេញ';
+$labels['longaclx'] = 'ថត​នេះ អាច​ត្រូវ​បាន​លុប ឬ​ ប្ដូរ​ឈ្មោះ';
+$labels['longacla'] = 'សិទ្ធិ​ចូល​ទៅ​កាន់​ថត​នេះ​អាច​ត្រូវ​បាន​​ផ្លាស់​ប្ដូរ​';
 $labels['longacldelete'] = 'សារ​នេះ​អាច​ត្រូវ​បាន​លុប';
 $messages['deleting'] = 'កំពុង​លុប​សិទ្ធិ​ចូល...';
 $messages['saving'] = 'រក្សា​ទុក​សិទ្ធិ​ចូល...';
+$messages['deletesuccess'] = 'លុប​សិទ្ធិ​ចូល​ដោយ​ជោគជ័យ​';
+$messages['createsuccess'] = 'បន្ថែម​សិទ្ធិ​ចូល​ដោយ​ជោគជ័យ';
 $messages['updateerror'] = 'មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សិទ្ធិ​ចូល';
+$messages['deleteerror'] = 'មិន​អាច​លុប​សិទ្ធិ​ចូល';
 $messages['createerror'] = 'មិន​អាច​បន្ថែម​សិទ្ធិ​ចូល';
 $messages['deleteconfirm'] = 'តើ​អ្នក​ពិត​ជា​ចង់​ដក​សិទ្ធ​ចូល​ពី​អ្នក​ប្រើប្រាស់​ដែល​បាន​រើស​មែនទេ?';
 $messages['norights'] = 'មិន​បាន​បញ្ជាក់​សិទ្ធិ​ច្បាស់​លាស់!';

plugins/acl/localization/ko_KR.inc

@@ -19,31 +19,33 @@ $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
 $labels['advanced'] = '고급 모드';
-$labels['newuser'] = '엔트리 추가';
+$labels['newuser'] = '입력내용 추가';
+$labels['editperms'] = '권한 수정';
 $labels['actions'] = '접근 권한 동작...';
 $labels['anyone'] = '모든 사용자 (아무나)';
 $labels['anonymous'] = '방문자 (익명)';
 $labels['identifier'] = '식별자';
 $labels['acll'] = '조회';
 $labels['aclr'] = '읽은 메시지';
-$labels['acls'] = '읽은 상태로 유지';
+$labels['acls'] = '읽은 상태 유지';
 $labels['aclw'] = '쓰기 깃발';
 $labels['acli'] = '삽입 (복사할 위치)';
 $labels['aclp'] = '게시';
-$labels['aclc'] = '하위 폴더 만들기';
-$labels['aclk'] = '하위 폴더 만들기';
+$labels['aclc'] = '하위 폴더 생성';
+$labels['aclk'] = '하위 폴더 생성';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
 $labels['acle'] = '영구 제거';
 $labels['aclx'] = '폴더 삭제';
-$labels['acla'] = '관리자';
-$labels['aclfull'] = '전체 제어권';
+$labels['acla'] = '관리';
+$labels['acln'] = '메시지에 주석 추가';
+$labels['aclfull'] = '전체 제어 권한';
 $labels['aclother'] = '기타';
-$labels['aclread'] = '읽기';
+$labels['aclread'] = '읽음';
 $labels['aclwrite'] = '쓰기';
 $labels['acldelete'] = '삭제';
 $labels['shortacll'] = '조회';
-$labels['shortaclr'] = '읽기';
+$labels['shortaclr'] = '읽음';
 $labels['shortacls'] = '보관';
 $labels['shortaclw'] = '쓰기';
 $labels['shortacli'] = '삽입';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = '삭제';
 $labels['shortacle'] = '지움';
 $labels['shortaclx'] = '폴더 삭제';
 $labels['shortacla'] = '관리';
+$labels['shortacln'] = '주석 추가';
 $labels['shortaclother'] = '기타';
 $labels['shortaclread'] = '읽기';
 $labels['shortaclwrite'] = '쓱';
@@ -62,9 +65,9 @@ $labels['shortacldelete'] = '삭제';
 $labels['longacll'] = '폴더가 목록에 나타나고 다음 사용자가 구독할 수 있음:';
 $labels['longaclr'] = '읽기 위해 폴더를 열 수 있음';
 $labels['longacls'] = '읽은 메시지 깃발이 변경될 수 있음';
-$labels['longaclw'] = '메시지 깃발 및 키워드를 변경할 수 있음, 다만 읽음 및 삭제됨은 제외';
+$labels['longaclw'] = '메시지 깃발 및 키워드를 변경할 수 있음, 다만 읽음 및 삭제됨은 제외됨';
 $labels['longacli'] = '메시지를 폴더에 복사하거나 작성할 수 있음';
-$labels['longaclp'] = '메시지를 이 폴더로 게시할 수 있음';
+$labels['longaclp'] = '메시지가 이 폴더에 게시될 수 있음';
 $labels['longaclc'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longaclk'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longacld'] = '메시지 삭제 깃발이 변경될 수 있음';
@@ -72,18 +75,23 @@ $labels['longaclt'] = '메시지 삭제 깃발이 변경될 수 있음';
 $labels['longacle'] = '메시지가 영구 제거될 수 있음';
 $labels['longaclx'] = '폴더를 삭제하거나 이름을 변경 할 수 있음';
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
-$labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
+$labels['longacln'] = '공유된 메타데이터(주석)은 변경될 수 있습니다';
+$labels['longaclfull'] = '폴더 관리를 포함한 전체 제어 권한';
 $labels['longaclread'] = '폴더를 열어 읽을 수 있음';
-$labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 이동하거나 복사할 수 있음';
+$labels['longaclwrite'] = '메시지를 표시하거나, 폴더로 이동 또는 복사할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
+$labels['longaclother'] = '기타 접근 권한';
+$labels['ariasummaryacltable'] = '접근 권한 목록';
+$labels['arialabelaclactions'] = '목록 동작';
+$labels['arialabelaclform'] = '접근 권한 양식';
 $messages['deleting'] = '접근 권한을 삭제하는 중...';
 $messages['saving'] = '접근 권한을 저장하는 중...';
-$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함.';
+$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함';
 $messages['deletesuccess'] = '접근 권한을 성공적으로 삭제함.';
 $messages['createsuccess'] = '접근 권한을 성공적으로 추가함.';
 $messages['updateerror'] = '접근 권한을 업데이트 할 수 없음';
-$messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
-$messages['createerror'] = '접근 권한을 추가할 수 없음.';
+$messages['deleteerror'] = '접근 권한을 삭제할 수 없음';
+$messages['createerror'] = '접근 권한을 추가할 수 없음';
 $messages['deleteconfirm'] = '정말로 선택한 사용자의 접근 권한을 삭제하시겠습니까?';
 $messages['norights'] = '지정된 권한이 없음!';
 $messages['nouser'] = '지정된 사용자명이 없음!';

plugins/acl/localization/ku.inc

@@ -0,0 +1,83 @@
+<?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'] = 'Parvekirin';
+$labels['myrights'] = 'Mafên Têketinê';
+$labels['username'] = 'Bikarhêner:';
+$labels['advanced'] = 'Moda pêşketî';
+$labels['newuser'] = 'Têketinek zêde bike';
+$labels['editperms'] = 'Destûrdayînan Sererast Bike';
+$labels['actions'] = 'Digihîje tevgerên çê..';
+$labels['anyone'] = 'Hemû bikarhêner (her kes)';
+$labels['anonymous'] = 'Mêvan (gelêrî)';
+$labels['identifier'] = 'Danasîner';
+$labels['acll'] = 'Lê bigere';
+$labels['aclr'] = 'Peyaman bixwîne';
+$labels['aclw'] = 'Alayan binivîse';
+$labels['aclp'] = 'Şandî';
+$labels['aclc'] = 'Bindosyeyan çêke';
+$labels['aclk'] = 'Bindosyeyan çêke';
+$labels['acld'] = 'Peyaman binivîse';
+$labels['aclt'] = 'Peyaman jê bibe';
+$labels['acle'] = 'Jê derxîne';
+$labels['aclx'] = 'Dosyeyê jê bibe';
+$labels['acla'] = 'Birêvebir';
+$labels['acln'] = 'Bi nîşeyan peyaman rave bike';
+$labels['aclfull'] = 'Tam venêrîn';
+$labels['aclother'] = 'Ên din';
+$labels['aclread'] = 'Bixwîne';
+$labels['aclwrite'] = 'Binivîse';
+$labels['acldelete'] = 'Jê bibe';
+$labels['shortacll'] = 'Lê bigere';
+$labels['shortaclr'] = 'Bixwîne';
+$labels['shortacls'] = 'Bihêle';
+$labels['shortaclw'] = 'Binivîse';
+$labels['shortacli'] = 'Tev bike';
+$labels['shortaclp'] = 'Şandî';
+$labels['shortaclc'] = 'Çêke';
+$labels['shortaclk'] = 'Çêke';
+$labels['shortacld'] = 'Jê bibe';
+$labels['shortaclt'] = 'Jê bibe';
+$labels['shortacle'] = 'Jê derxîne';
+$labels['shortaclx'] = 'Dosye-jêbirin';
+$labels['shortacla'] = 'Bikarhêner';
+$labels['shortacln'] = 'Bi nîşeyan rave bike';
+$labels['shortaclother'] = 'Ên din';
+$labels['shortaclread'] = 'Bixwîne';
+$labels['shortaclwrite'] = 'Binivîse';
+$labels['shortacldelete'] = 'Jê bibe';
+$labels['longaclr'] = 'Dosye ji bo xwendinê dikare bê vekirin';
+$labels['longacls'] = 'Alaya peyamên Dîtî dikare bête guhartin';
+$labels['longaclread'] = 'Dosye ji bo xwendinê dikare bê vekirin';
+$labels['longaclwrite'] = 'Peyam dikarin kopiyî dosyeyê bên kirin, nîşankirin, nivîsandin.';
+$labels['longacldelete'] = 'Hêmî peyam dikarin werin jêbirin';
+$labels['longaclother'] = 'Mafên din ên têketinê';
+$labels['ariasummaryacltable'] = 'Lîsteya mafên têketinê';
+$labels['arialabelaclactions'] = 'Tevgeran liste bike';
+$labels['arialabelaclform'] = 'Forma mafên têketinê';
+$messages['deleting'] = 'Mafên têketinê tên jêbirin...';
+$messages['saving'] = 'Mafên têketinê tên tomarkirin...';
+$messages['updatesuccess'] = 'Mafên têketinê bi serkeftin hatin guhartin';
+$messages['deletesuccess'] = 'Mafên têketinê bi serkeftin hatin jêbirin';
+$messages['createsuccess'] = 'Mafên têketinê bi serkeftin hatin tevkirin';
+$messages['updateerror'] = 'Nûkirina mafên têketinê bigire';
+$messages['deleteerror'] = 'Jêbirina mafên têketinê bigire';
+$messages['createerror'] = 'Tevkirina mafên têketinê bigire';
+$messages['deleteconfirm'] = 'Tu ewle yî, dixwazî mafên têketinê yên bikarhênerê(n) bijartî rakî?';
+$messages['norights'] = 'Tu maf nehat diyarkirin!';
+$messages['nouser'] = 'Tu bikarhêner nehat diyarkirin!';
+?>

plugins/acl/localization/ku_IQ.inc

@@ -0,0 +1,26 @@
+<?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['username'] = 'بەکارهێنەر:';
+$labels['advanced'] = 'شێوازی پێشکەوتوو';
+$labels['shortaclc'] = 'دروستکردن';
+$labels['shortaclk'] = 'دروستکردن';
+$labels['shortacld'] = 'سڕینەوە';
+$labels['shortaclt'] = 'سڕینەوە';
+$labels['shortaclx'] = 'سڕینەوەی بوخچە';
+?>

plugins/acl/localization/lb_LU.inc

@@ -18,7 +18,7 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Zougrëffsrechter';
 $labels['username'] = 'Benotzer:';
-$labels['advanced'] = 'avancéierte Modus';
+$labels['advanced'] = 'Avancéierte Modus';
 $labels['newuser'] = 'Element dobäisetzen';
 $labels['actions'] = 'Optioune fir d\'Zougrëffsrechter';
 $labels['anyone'] = 'All d\'Benotzer (jiddwereen)';

plugins/acl/localization/lt_LT.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
-$labels['advanced'] = 'pažengusio vartotojo rėžimas';
+$labels['advanced'] = 'Pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
+$labels['editperms'] = 'Tvarkyti leidimus';
 $labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
 $labels['anonymous'] = 'Svečias (anonimas)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ištrinti žinutes';
 $labels['acle'] = 'Išbraukti';
 $labels['aclx'] = 'Ištrinti aplanką';
 $labels['acla'] = 'Valdyti';
+$labels['acln'] = 'Anotuoti laiškus';
 $labels['aclfull'] = 'Visiška kontrolė';
 $labels['aclother'] = 'Kita';
 $labels['aclread'] = 'Skaityti';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Trinti';
 $labels['shortacle'] = 'Išbraukti';
 $labels['shortaclx'] = 'Ištrinti aplanką';
 $labels['shortacla'] = 'Valdyti';
+$labels['shortacln'] = 'Anotuoti';
 $labels['shortaclother'] = 'Kita';
 $labels['shortaclread'] = 'Skaityti';
 $labels['shortaclwrite'] = 'Įrašyti';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Bendrieji laiškų meta-duomenys (anotacijos) gali būti pakeisti';
 $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['longaclother'] = 'Kitos prieigos teisės';
+$labels['ariasummaryacltable'] = 'Prieigos teisių sąrašas';
+$labels['arialabelaclactions'] = 'Rodyti veiksmus';
+$labels['arialabelaclform'] = 'Prieigos teisių forma';
 $messages['deleting'] = 'Panaikinamos prieigos teisės';
 $messages['saving'] = 'Išsaugomos prieigos teisės';
 $messages['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';

plugins/acl/localization/lv_LV.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Dalīšanās';
 $labels['myrights'] = 'Piekļuves tiesības';
 $labels['username'] = 'Lietotājs:';
-$labels['advanced'] = 'paplašinātais režīms';
 $labels['newuser'] = 'Pievienot ierakstu';
 $labels['actions'] = 'Darbības ar piekļuves tiesībām...';
 $labels['anyone'] = 'Visi lietotāji (ikviens)';

plugins/acl/localization/nb_NO.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Tilgangsrettigheter';
 $labels['username'] = 'Bruker:';
 $labels['advanced'] = 'Avansert modus';
 $labels['newuser'] = 'Legg til oppføring';
+$labels['editperms'] = 'Rediger tilgangsrettigheter';
 $labels['actions'] = 'Valg for tilgangsrettigheter.';
 $labels['anyone'] = 'Alle brukere (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
@@ -81,6 +82,7 @@ $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';

plugins/acl/localization/nl_NL.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
-$labels['advanced'] = 'geavanceerde modus';
+$labels['advanced'] = 'Geavanceerde modus';
 $labels['newuser'] = 'Item toevoegen';
+$labels['editperms'] = 'Rechten bewerken';
 $labels['actions'] = 'Toegangsrechtenopties...';
 $labels['anyone'] = 'Alle gebruikers (iedereen)';
 $labels['anonymous'] = 'Gasten (anoniem)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Berichten verwijderen';
 $labels['acle'] = 'Vernietigen';
 $labels['aclx'] = 'Map verwijderen';
 $labels['acla'] = 'Beheren';
+$labels['acln'] = 'Annoteer berichten';
 $labels['aclfull'] = 'Volledige toegang';
 $labels['aclother'] = 'Overig';
 $labels['aclread'] = 'Lezen';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Verwijderen';
 $labels['shortacle'] = 'Vernietigen';
 $labels['shortaclx'] = 'Map verwijderen';
 $labels['shortacla'] = 'Beheren';
+$labels['shortacln'] = 'Annoteren';
 $labels['shortaclother'] = 'Overig';
 $labels['shortaclread'] = 'Lezen';
 $labels['shortaclwrite'] = 'Schrijven';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Gedeelde metadata (annotaties) van berichten kan aangepast 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['longaclother'] = 'Overige toegangsrechten';
+$labels['ariasummaryacltable'] = 'Lijst van toegangsrechten';
+$labels['arialabelaclactions'] = 'Lijstacties';
+$labels['arialabelaclform'] = 'Formulier voor toegangsrechten';
 $messages['deleting'] = 'Toegangsrechten worden verwijderd...';
 $messages['saving'] = 'Toegangsrechten worden opgeslagen...';
 $messages['updatesuccess'] = 'Toegangsrechten succesvol veranderd';

plugins/acl/localization/nn_NO.inc

@@ -18,7 +18,6 @@
 $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)';

plugins/acl/localization/pl_PL.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
-$labels['advanced'] = 'tryb zaawansowany';
+$labels['advanced'] = 'Tryb zaawansowany';
 $labels['newuser'] = 'Dodaj rekord';
+$labels['editperms'] = 'Edytuj zezwolenia';
 $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Goście (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Usuwanie wiadomości (Delete)';
 $labels['acle'] = 'Porządkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja';
+$labels['acln'] = 'Adnotacje wiadomości';
 $labels['aclfull'] = 'Wszystkie';
 $labels['aclother'] = 'Pozostałe';
 $labels['aclread'] = 'Odczyt';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Usuwanie';
 $labels['shortacle'] = 'Porządkowanie';
 $labels['shortaclx'] = 'Usuwanie folderu';
 $labels['shortacla'] = 'Administracja';
+$labels['shortacln'] = 'Adnotacje';
 $labels['shortaclother'] = 'Pozostałe';
 $labels['shortaclread'] = 'Odczyt';
 $labels['shortaclwrite'] = 'Zapis';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Pozwala na zmianę współdzielonych meta-danych wiadomości (adnotacji)';
 $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['longaclother'] = 'Inne prawa dostępu';
+$labels['ariasummaryacltable'] = 'Spis praw dostępu';
+$labels['arialabelaclactions'] = 'Lista działań';
+$labels['arialabelaclform'] = 'Formularz praw dostępu';
 $messages['deleting'] = 'Usuwanie praw dostępu...';
 $messages['saving'] = 'Zapisywanie praw dostępu...';
 $messages['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';

plugins/acl/localization/pt_BR.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
-$labels['advanced'] = 'modo avançado';
+$labels['advanced'] = 'Modo avançado';
 $labels['newuser'] = 'Adicionar entrada';
+$labels['editperms'] = 'Editar permissões';
 $labels['actions'] = 'Ações de direito de acesso...';
 $labels['anyone'] = 'Todos os usuários (qualquer um)';
 $labels['anonymous'] = 'Convidados (anônimos)';
@@ -35,8 +36,9 @@ $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Apagar mensagens';
 $labels['aclt'] = 'Apagar mensagens';
 $labels['acle'] = 'Expurgar';
-$labels['aclx'] = 'Apagar pasta';
+$labels['aclx'] = 'Excluir pasta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Inserir anotações nas mensagens';
 $labels['aclfull'] = 'Controle total';
 $labels['aclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Excluir';
 $labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Excluir pasta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Outro';
 $labels['shortaclread'] = 'Ler';
 $labels['shortaclwrite'] = 'Salvar';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Metadados compartilhados das mensagens (anotações) podem ser alterados';
 $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['longaclother'] = 'Outras permissões de acesso';
+$labels['ariasummaryacltable'] = 'Lista de permissões de acesso';
+$labels['arialabelaclactions'] = 'Lista de ações';
+$labels['arialabelaclform'] = 'Formulário de permissões de acesso';
 $messages['deleting'] = 'Apagando permissões de acesso...';
 $messages['saving'] = 'Salvando permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';

plugins/acl/localization/pt_PT.inc

@@ -20,70 +20,78 @@ $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
 $labels['advanced'] = 'Modo avançado';
 $labels['newuser'] = 'Adicionar entrada';
+$labels['editperms'] = 'Editar permissões';
 $labels['actions'] = 'Acções de permissão de acesso...';
 $labels['anyone'] = 'Todos os utilizadores (todos)';
-$labels['anonymous'] = 'Convidado (anónimo)';
+$labels['anonymous'] = 'Convidados (anónimo)';
 $labels['identifier'] = 'Identificador';
 $labels['acll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
-$labels['acls'] = 'Manter estado de enviado';
+$labels['acls'] = 'Manter estado Visto';
 $labels['aclw'] = 'Guardar marcadores';
-$labels['acli'] = 'Inserir (cópia em)';
+$labels['acli'] = 'Inserir (Copiar para)';
 $labels['aclp'] = 'Publicar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Eliminar mensagens';
 $labels['aclt'] = 'Eliminar mensagens';
-$labels['acle'] = 'Eliminar';
+$labels['acle'] = 'Purgar';
 $labels['aclx'] = 'Eliminar pasta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensagens';
 $labels['aclfull'] = 'Controlo total';
 $labels['aclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['aclwrite'] = 'Guardar';
+$labels['aclwrite'] = 'Escrever';
 $labels['acldelete'] = 'Eliminar';
 $labels['shortacll'] = 'Pesquisar';
 $labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
-$labels['shortaclw'] = 'Guardar';
+$labels['shortaclw'] = 'Escrever';
 $labels['shortacli'] = 'Inserir';
 $labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
 $labels['shortacld'] = 'Eliminar';
 $labels['shortaclt'] = 'Eliminar';
-$labels['shortacle'] = 'Eliminar';
+$labels['shortacle'] = 'Purgar';
 $labels['shortaclx'] = 'Eliminar pasta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Outro';
 $labels['shortaclread'] = 'Ler';
-$labels['shortaclwrite'] = 'Guardar';
+$labels['shortaclwrite'] = 'Escrever';
 $labels['shortacldelete'] = 'Eliminar';
-$labels['longacll'] = 'A pasta está visível na lista e pode subscrita para';
+$labels['longacll'] = 'A pasta está visível em listas e pode subscrita';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longacls'] = 'O marcador de mensagem enviada pode ser alterado';
-$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto de Enviadas e Eliminadas';
-$labels['longacli'] = 'As mensagens podem ser escritas e copiadas para a pasta';
-$labels['longaclp'] = 'As mensagens podem ser publicadas na pasta';
-$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
-$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
-$labels['longacld'] = 'O marcador de mensagens Eliminadas pode ser alterado';
-$labels['longaclt'] = 'O marcador de mensagens Eliminadas pode ser alterado';
-$labels['longacle'] = 'As mensagens podem ser eliminadas';
+$labels['longacls'] = 'O marcador Mensagens Vistas pode ser alterado';
+$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto Vistas e Eliminadas';
+$labels['longacli'] = 'As mensagens podem ser escritas ou copiadas para a pasta';
+$labels['longaclp'] = 'As mensagens podem ser publicadas para esta pasta';
+$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) directamente debaixo desta pasta';
+$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) directamente debaixo desta pasta';
+$labels['longacld'] = 'O marcador Apagar Mensagens pode ser alterado';
+$labels['longaclt'] = 'O marcador Apagar Mensagens pode ser alterado';
+$labels['longacle'] = 'As mensagens podem ser purgadas';
 $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['longacln'] = 'Mensagens de metadados (anotações) partilhadas podem ser alteradas';
+$labels['longaclfull'] = 'Controlo total incluindo administração de pastas';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
-$messages['deleting'] = 'A eliminar as permissões de acesso...';
-$messages['saving'] = 'A guardar as permissões de acesso...';
+$labels['longaclother'] = 'Outros direitos de acesso';
+$labels['ariasummaryacltable'] = 'Lista de direitos de acesso';
+$labels['arialabelaclactions'] = 'Lista de acções';
+$labels['arialabelaclform'] = 'Formulário de direitos de acesso';
+$messages['deleting'] = 'A eliminar permissões de acesso...';
+$messages['saving'] = 'A guardar permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
 $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 os direitos 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['deleteerror'] = 'Não foi possível eliminar permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar 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!';

plugins/acl/localization/ro_RO.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Partajare';
 $labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
-$labels['advanced'] = 'mod avansat';
+$labels['advanced'] = 'Modul avansat';
 $labels['newuser'] = 'Adăugare intrare';
+$labels['editperms'] = 'Editare permisiuni';
 $labels['actions'] = 'Acțiunea drepturilor de acces...';
 $labels['anyone'] = 'Toți utilizatori (oricare)';
 $labels['anonymous'] = 'Vizitator';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ștergere mesaje';
 $labels['acle'] = 'Elimină';
 $labels['aclx'] = 'Ștergere dosar';
 $labels['acla'] = 'Administrează';
+$labels['acln'] = 'Adnoteaza mesajele';
 $labels['aclfull'] = 'Control complet';
 $labels['aclother'] = 'Altul';
 $labels['aclread'] = 'Citeşte';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Șterge';
 $labels['shortacle'] = 'Elimină';
 $labels['shortaclx'] = 'Ștergere dosar';
 $labels['shortacla'] = 'Administrează';
+$labels['shortacln'] = 'Adnotă';
 $labels['shortaclother'] = 'Altul';
 $labels['shortaclread'] = 'Citeşte';
 $labels['shortaclwrite'] = 'Scrie';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Indicatorul de Șters al mesajelor se poate 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['longacln'] = 'Metadatele (adnotarile) impartite ale mesajelor pot fi schimbate';
 $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';

plugins/acl/localization/ru_RU.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
 $labels['advanced'] = 'Экспертный режим';
 $labels['newuser'] = 'Добавить поле';
+$labels['editperms'] = 'Редактировать права';
 $labels['actions'] = 'Действия с правами доступа...';
 $labels['anyone'] = 'Все пользователи (любые)';
 $labels['anonymous'] = 'Гости (анонимные)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Удалить сообщения';
 $labels['acle'] = 'Уничтожить сообщения';
 $labels['aclx'] = 'Удалить папку';
 $labels['acla'] = 'Администрировать';
+$labels['acln'] = 'Комментировать сообщения';
 $labels['aclfull'] = 'Полный доступ';
 $labels['aclother'] = 'Другое';
 $labels['aclread'] = 'Чтение';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Удаление';
 $labels['shortacle'] = 'Уничтожить сообщения';
 $labels['shortaclx'] = 'Удаление папки';
 $labels['shortacla'] = 'Администрировать';
+$labels['shortacln'] = 'Комментировать';
 $labels['shortaclother'] = 'Другое';
 $labels['shortaclread'] = 'Чтение';
 $labels['shortaclwrite'] = 'Запись';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Флаг Удалено может быть измене
 $labels['longacle'] = 'Сообщения могут быть уничтожены';
 $labels['longaclx'] = 'Эта папка может быть переименована или удалена';
 $labels['longacla'] = 'Права доступа к папке могут быть изменены';
+$labels['longacln'] = 'Совместные медаданные сообщений (комментарии) могут быть изменены';
 $labels['longaclfull'] = 'Полный доступ, включая управление папкой';
 $labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longaclwrite'] = 'Сообщения можно помечать, записывать или копировать в папку';
 $labels['longacldelete'] = 'Сообщения можно удалять';
+$labels['longaclother'] = 'Прочие права доступа';
+$labels['ariasummaryacltable'] = 'Список прав доступа';
+$labels['arialabelaclactions'] = 'Список действий';
+$labels['arialabelaclform'] = 'Форма прав доступа';
 $messages['deleting'] = 'Удаление прав доступа...';
 $messages['saving'] = 'Сохранение прав доступа...';
 $messages['updatesuccess'] = 'Права доступа успешно изменены';

plugins/acl/localization/sk_SK.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové oprávnenia';
 $labels['username'] = 'Používateľ:';
-$labels['advanced'] = 'pokročilý režim';
+$labels['advanced'] = 'Režim pre pokročilých';
 $labels['newuser'] = 'Pridať záznam';
+$labels['editperms'] = 'Upraviť oprávnenia';
 $labels['actions'] = 'Prístupové práva pre akcie...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
 $labels['anonymous'] = 'Hostia (anonymní)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Vymazať správy';
 $labels['acle'] = 'Vyčistiť';
 $labels['aclx'] = 'Vymazať priečinok';
 $labels['acla'] = 'Spravovať';
+$labels['acln'] = 'Označiť správy poznámkou';
 $labels['aclfull'] = 'Úplný prístup';
 $labels['aclother'] = 'Iné';
 $labels['aclread'] = 'Čítanie';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Vymazať';
 $labels['shortacle'] = 'Vyčistiť';
 $labels['shortaclx'] = 'Vymazať priečinok';
 $labels['shortacla'] = 'Spravovať';
+$labels['shortacln'] = 'Označiť poznámkou';
 $labels['shortaclother'] = 'Iné';
 $labels['shortaclread'] = 'Čítanie';
 $labels['shortaclwrite'] = 'Zápis';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longacle'] = 'Správy je možné vyčistiť';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
 $labels['longacla'] = 'Prístupové oprávnenia k tomuto priečinku je možné zmeniť';
+$labels['longacln'] = 'Meta-dáta (poznámky) zdieľané medzi správami, je možné zmeniť';
 $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['longaclother'] = 'Iné prístupové oprávnenia';
+$labels['ariasummaryacltable'] = 'Zoznam prístupových oprávnení';
+$labels['arialabelaclactions'] = 'Zoznam akcií';
+$labels['arialabelaclform'] = 'Formulár pre prístupové oprávnenia';
 $messages['deleting'] = 'Odstraňovanie prístupových oprávnení...';
 $messages['saving'] = 'Ukladanie prístupových oprávnení...';
 $messages['updatesuccess'] = 'Prístupové oprávnenia boli úspešne zmenené';

plugins/acl/localization/sl_SI.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
 $labels['advanced'] = 'Napredni način';
 $labels['newuser'] = 'Dodaj vnos';
+$labels['editperms'] = 'Uredi pravice';
 $labels['actions'] = 'Nastavitve pravic dostopa';
 $labels['anyone'] = 'Vsi uporabniki';
 $labels['anonymous'] = 'Gosti';

plugins/acl/localization/sv_SE.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
-$labels['advanced'] = 'avancerat läge';
+$labels['advanced'] = 'Avancerat läge';
 $labels['newuser'] = 'Lägg till';
+$labels['editperms'] = 'Ändra rättigheter';
 $labels['actions'] = 'Hantera åtkomsträttigheter...';
 $labels['anyone'] = 'Alla användare (vem som helst)';
 $labels['anonymous'] = 'Gäster (anonyma)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ta bort meddelanden';
 $labels['acle'] = 'Utplåna';
 $labels['aclx'] = 'Ta bort katalog';
 $labels['acla'] = 'Administrera';
+$labels['acln'] = 'Kommentera meddelanden';
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Övrig';
 $labels['aclread'] = 'Läs';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Ta bort';
 $labels['shortacle'] = 'Utplåna';
 $labels['shortaclx'] = 'Ta bort katalog';
 $labels['shortacla'] = 'Administrera';
+$labels['shortacln'] = 'Kommentera';
 $labels['shortaclother'] = 'Övrig';
 $labels['shortaclread'] = 'Läs';
 $labels['shortaclwrite'] = 'Skriv';
@@ -72,10 +75,15 @@ $labels['longaclt'] = 'Meddelandeflagga Borttaget 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['longacln'] = 'Delad information om meddelanden (kommentarer) 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['longaclother'] = 'Övriga åtkomsträttigheter';
+$labels['ariasummaryacltable'] = 'Lista med åtkomsträttigheter';
+$labels['arialabelaclactions'] = 'Hantera listor';
+$labels['arialabelaclform'] = 'Formulär för åtkomsträttigheter';
 $messages['deleting'] = 'Tar bort åtkomsträttigheter...';
 $messages['saving'] = 'Sparar åtkomsträttigheter...';
 $messages['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';

plugins/acl/localization/th_TH.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'การแชร์ข้อมูล';
 $labels['myrights'] = 'สิทธิ์การเข้าใช้';
 $labels['username'] = 'ผู้ใช้งาน:';
-$labels['advanced'] = 'โหมดขั้นสูง';
 $labels['newuser'] = 'เพิ่มรายการ';
 $labels['anyone'] = 'ผู้ใช้งานทั้งหมด (ใครก็ได้)';
 $labels['anonymous'] = 'ผู้เยี่ยมชม (คนแปลกหน้า)';

plugins/acl/localization/ti.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = 'ንኻልእ';
 $labels['myrights'] = 'መሰላት በዓል ዋና';
 $labels['username'] = 'በዓል ዋና';
-$labels['advanced'] = 'ዝማዕበለ አሰራርሓ';
 $labels['newuser'] = 'እታዎ ክውስኽ';
 $labels['actions'] = 'ንጥፈታት መብት ተጠቃማይነት';
 $labels['anyone'] = 'ኩሉም በዓልቲ ዋናታት(ዝኾነ ሰብ)';

plugins/acl/localization/tr_TR.inc

@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
-$labels['advanced'] = 'İleri seviye mod';
+$labels['advanced'] = 'Gelişmiş mod';
 $labels['newuser'] = 'Girdi ekle';
+$labels['editperms'] = 'İzinleri düzenle';
 $labels['actions'] = 'Erişim hakları aksiyonları...';
 $labels['anyone'] = 'Tüm kullanıcılar(kim olursa)';
 $labels['anonymous'] = 'Ziyaretçiler(anonim)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Mesajları  sil';
 $labels['acle'] = 'Sil';
 $labels['aclx'] = 'Dizini sil';
 $labels['acla'] = 'Yönet';
+$labels['acln'] = 'Mesajlara not ekle';
 $labels['aclfull'] = 'Tam kontrol';
 $labels['aclother'] = 'Diğer';
 $labels['aclread'] = 'Oku';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Sil';
 $labels['shortacle'] = 'Sil';
 $labels['shortaclx'] = 'Dizin sil';
 $labels['shortacla'] = 'Yönet';
+$labels['shortacln'] = 'Not ekle';
 $labels['shortaclother'] = 'Diğer';
 $labels['shortaclread'] = 'Oku';
 $labels['shortaclwrite'] = 'Yaz';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Mesajların paylaşılan üst verileri (notlar) 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['longaclother'] = 'Diğer erişim hakları';
+$labels['ariasummaryacltable'] = 'Erişim hakları listesi';
+$labels['arialabelaclactions'] = 'Aksiyon listesi';
+$labels['arialabelaclform'] = 'Erişim hakları formu';
 $messages['deleting'] = 'Erişim hakları siliniyor...';
 $messages['saving'] = 'Erişim hakları saklanıyor...';
 $messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';

plugins/acl/localization/uk_UA.inc

@@ -17,7 +17,6 @@
 */
 $labels['myrights'] = 'Права доступу';
 $labels['username'] = 'Користувач:';
-$labels['advanced'] = 'розширений режим';
 $labels['anyone'] = 'Всі користувачі (кожен)';
 $labels['anonymous'] = 'Гості (аноніми)';
 $labels['aclc'] = 'Створити підтеки';

plugins/acl/localization/vi_VN.inc

@@ -20,6 +20,7 @@ $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
 $labels['advanced'] = 'Chế độ tính năng cao hơn';
 $labels['newuser'] = 'Thêm bài viết';
+$labels['editperms'] = 'Sửa đổi quyền sử dụng';
 $labels['actions'] = 'Các thao tác 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)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Xóa thư';
 $labels['acle'] = 'Thải bỏ';
 $labels['aclx'] = 'Xóa giữ liệu';
 $labels['acla'] = 'Quản lý';
+$labels['acln'] = 'Thông tin chú thích';
 $labels['aclfull'] = 'Quản lý toàn bộ';
 $labels['aclother'] = 'Loại khác';
 $labels['aclread'] = 'Đọc';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Xoá';
 $labels['shortacle'] = 'Thải bỏ';
 $labels['shortaclx'] = 'Giữ liệu được xóa';
 $labels['shortacla'] = 'Quản lý';
+$labels['shortacln'] = 'Chú thích';
 $labels['shortaclother'] = 'Loại khác';
 $labels['shortaclread'] = 'Đọc';
 $labels['shortaclwrite'] = 'Viết';
@@ -72,10 +75,15 @@ $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['longacln'] = 'Dữ liệu thông tin (chú thích) của thư 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['longaclother'] = 'Quyền truy cập khác';
+$labels['ariasummaryacltable'] = 'Danh sách quyền truy cập';
+$labels['arialabelaclactions'] = 'Danh sách hành động';
+$labels['arialabelaclform'] = 'Bảng khai quyền truy cập';
 $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...';

plugins/acl/localization/zh_CN.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
 $labels['username'] = '用户：';
-$labels['advanced'] = '高级模式';
 $labels['newuser'] = '新增条目';
 $labels['actions'] = '权限设置...';
 $labels['anyone'] = '所有用户(任何人)';

plugins/acl/localization/zh_TW.inc

@@ -18,7 +18,6 @@
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者：';
-$labels['advanced'] = '進階模式';
 $labels['newuser'] = '新增項目';
 $labels['actions'] = '權限設定';
 $labels['anyone'] = '所有使用者 (anyone)';

plugins/acl/skins/classic/acl.css

@@ -87,9 +87,7 @@
 
 #aclform
 {
-  top: 80px;
-  width: 480px;
-  padding: 10px;
+  display: none;
 }
 
 #aclform div

plugins/acl/skins/classic/templates/table.html

@@ -24,17 +24,13 @@
     </ul>
 </div>
 
-<div id="aclform" class="popupmenu">
+<div id="aclform" style="position:absolute; width:480px; top:0; left:0; padding:10px">
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
         <roundcube:object name="acluser" class="toolbarmenu" id="acluser" size="35" />
     </fieldset>
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.myrights" /></legend>
         <roundcube:object name="aclrights" class="toolbarmenu" />
     </fieldset>
-    <div>
-        <roundcube:button command="acl-cancel" type="input" class="button" label="cancel" />
-        <roundcube:button command="acl-save" type="input" class="button mainaction" label="save" />
-    </div>
 </div>
 
 <script type="text/javascript">

plugins/acl/skins/larry/acl.css

@@ -29,7 +29,6 @@
 #acltable td
 {
   white-space: nowrap;
-  border: none;
   text-align: center;
 }
 
@@ -38,19 +37,24 @@
   border-left: #BBD3DA dotted 1px;
   font-size: 11px;
   font-weight: bold;
+  width: auto;
 }
 
 #acltable tbody td
 {
   border-bottom: #DDDDDD 1px solid;
   text-align: center;
-  padding: 2px;
+  height: 16px;
   cursor: default;
 }
 
 #acltable thead td.user
 {
-  border-left: none;
+  width: 30%;
+}
+
+#acltable.advanced thead td.user {
+	width: 25%;
 }
 
 #acltable tbody td.user
@@ -60,7 +64,6 @@
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   border-left: none;
-  width: 50px;
 }
 
 #acltable tbody td.partial
@@ -99,10 +102,7 @@
 
 #aclform
 {
-  top: 80px;
-  width: 480px;
-  padding: 10px;
-  background-color: white;
+  display: none;
 }
 
 #aclform div

plugins/acl/skins/larry/templates/table.html

@@ -12,20 +12,16 @@
         <li><roundcube:button command="acl-edit" label="edit" class="icon" classAct="icon active" innerclass="icon edit" /></li>
         <li><roundcube:button command="acl-delete" label="delete" class="icon" classAct="icon active" innerclass="icon delete" /></li>
         <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
-            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
+            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch');return false" class="active" /></li>
         <roundcube:endif />
     </ul>
 </div>
 
-<div id="aclform" class="popupmenu propform">
+<div id="aclform" class="propform" style="position:absolute; width:480px; top:0; left:0; padding:8px">
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
-        <roundcube:object name="acluser" id="acluser" size="35" />
+        <roundcube:object name="acluser" id="acluser" size="35" class="proplist" />
     </fieldset>
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.myrights" /></legend>
-        <roundcube:object name="aclrights" />
+        <roundcube:object name="aclrights" class="proplist" />
     </fieldset>
-    <div class="formbuttons">
-        <roundcube:button command="acl-cancel" type="input" class="button" label="cancel" />
-        <roundcube:button command="acl-save" type="input" class="button mainaction" label="save" />
-    </div>
 </div>

plugins/additional_message_headers/additional_message_headers.php

@@ -24,23 +24,33 @@ class additional_message_headers extends rcube_plugin
     {
         $this->load_config();
 
-        $headers = $args['message']->headers();
-        $rcube   = rcube::get_instance();
+        $rcube = rcube::get_instance();
 
         // additional email headers
         $additional_headers = $rcube->config->get('additional_message_headers', array());
-        foreach ((array)$additional_headers as $header => $value) {
-            if (null === $value) {
-                unset($headers[$header]);
+
+        if (!empty($additional_headers)) {
+            // Mail_mime >= 1.9.0
+            if (method_exists($message, 'isMultipart')) {
+                $args['message']->headers($additional_headers, true);
             }
             else {
-                $headers[$header] = $value;
+                $headers = $args['message']->headers();
+
+                foreach ((array) $additional_headers as $header => $value) {
+                    if ($value === null) {
+                        unset($headers[$header]);
+                    }
+                    else {
+                        $headers[$header] = $value;
+                    }
+                }
+
+                $args['message']->_headers = array();
+                $args['message']->headers($headers);
             }
         }
 
-        $args['message']->_headers = array();
-        $args['message']->headers($headers);
-
         return $args;
     }
 }

plugins/additional_message_headers/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "Very simple plugin which will add additional headers to or remove them from outgoing messages.",
     "license": "GNU GPL v2",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "authors": [
         {
             "name": "Ziba Scott",

plugins/additional_message_headers/package.xml

@@ -16,7 +16,7 @@
  <date>2013-08-25</date>
  <version>
   <release>1.2.0</release>
-  <api>1.2.0</api>
+  <api>1.2.1</api>
  </version>
  <stability>
   <release>stable</release>

plugins/archive/archive.php

@@ -17,11 +17,17 @@ class archive extends rcube_plugin
   function init()
   {
     $rcmail = rcmail::get_instance();
+    $archive_folder = $rcmail->config->get('archive_mbox');
+
+    // add archive folder to the list of default mailboxes
+    if (($default_folders = $rcmail->config->get('default_folders')) && !in_array($archive_folder, $default_folders)) {
+      $default_folders[] = $archive_folder;
+      $rcmail->config->set('default_folders', $default_folders);
+    }
 
     // There is no "Archived flags"
     // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
-    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
-        && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+    if ($archive_folder && $rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')) {
       $skin_path = $this->local_skin_path();
       if (is_file($this->home . "/$skin_path/archive.css"))
         $this->include_stylesheet("$skin_path/archive.css");
@@ -48,12 +54,6 @@ class archive extends rcube_plugin
       // set env variables for client
       $rcmail->output->set_env('archive_folder', $archive_folder);
       $rcmail->output->set_env('archive_type', $rcmail->config->get('archive_type',''));
-
-      // add archive folder to the list of default mailboxes
-      if (($default_folders = $rcmail->config->get('default_folders')) && !in_array($archive_folder, $default_folders)) {
-        $default_folders[] = $archive_folder;
-        $rcmail->config->set('default_folders', $default_folders);
-      }
     }
     else if ($rcmail->task == 'mail') {
       // handler for ajax request

plugins/archive/localization/ast.inc

@@ -17,15 +17,15 @@
 */
 $labels['buttontext'] = 'Archivu';
 $labels['buttontitle'] = 'Archivar esti mensaxe';
-$labels['archived'] = 'Mensaxe archiváu';
-$labels['archivedreload'] = 'Archiváu correchamente. Recarga la páxina pa ver les nueves carpetes d\'archivu.';
+$labels['archived'] = 'Archiváu con ésitu';
+$labels['archivedreload'] = 'Archiváu con ésitu. Recarga la páxina pa ver les nueves carpetes d\'archivos.';
 $labels['archiveerror'] = 'Nun pudieron archivase dalgunos mensaxes';
 $labels['archivefolder'] = 'Archivu';
 $labels['settingstitle'] = 'Archivu';
 $labels['archivetype'] = 'Dividir l\'archivu por';
 $labels['archivetypeyear'] = 'Añu (p.ex. Archivu/2012)';
 $labels['archivetypemonth'] = 'Mes (p.ex. Archivu/2012/06)';
-$labels['archivetypefolder'] = 'Bandexa orixinal';
+$labels['archivetypefolder'] = 'Carpeta orixinal';
 $labels['archivetypesender'] = 'Corréu-e del remitente';
 $labels['unkownsender'] = 'desconocíu';
 ?>