From 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Nov 2014 04:03:58 -0500
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

---
 plugins/acl/localization/en_CA.inc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/plugins/acl/localization/en_CA.inc b/plugins/acl/localization/en_CA.inc
index 53d14ff..ae9cb8b 100644
--- a/plugins/acl/localization/en_CA.inc
+++ b/plugins/acl/localization/en_CA.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -36,6 +38,7 @@
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -54,6 +57,7 @@
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -71,6 +75,7 @@
 $labels['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';

--
Gitblit v1.9.1