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/cy_GB.inc |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 0b9d119..816d633 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -38,6 +38,7 @@
 $labels['acle'] = 'Dileu';
 $labels['aclx'] = 'Dileu ffolder';
 $labels['acla'] = 'Gweinyddu';
+$labels['acln'] = 'Anodi negeseuon';
 $labels['aclfull'] = 'Rheolaeth lawn';
 $labels['aclother'] = 'Arall';
 $labels['aclread'] = 'Darllen';
@@ -56,6 +57,7 @@
 $labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
 $labels['shortacla'] = 'Gweinyddu';
+$labels['shortacln'] = 'Anodi';
 $labels['shortaclother'] = 'Arall';
 $labels['shortaclread'] = 'Darllen';
 $labels['shortaclwrite'] = 'Ysgrifennu';
@@ -73,10 +75,15 @@
 $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';

--
Gitblit v1.9.1