Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 49 insertions, 0 deletions

diff --git a/plugins/managesieve/localization/lb_LU.inc b/plugins/managesieve/localization/lb_LU.inc
new file mode 100644
index 000000000..621fff831
--- /dev/null
+++ b/plugins/managesieve/localization/lb_LU.inc
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve 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-managesieve/
+*/
+$labels['filters'] = 'Filteren';
+$labels['managefilters'] = 'Filtere geréieren fir Mailen déi erakommen';
+$labels['filtername'] = 'Numm vum Filter';
+$labels['newfilter'] = 'Neie Filter';
+$labels['filteradd'] = 'Filter dobäisetzen';
+$labels['filterdel'] = 'Filter läschen';
+$labels['moveup'] = 'Eropréckelen';
+$labels['movedown'] = 'Erofréckelen';
+$labels['filterallof'] = 'all dës Reegele mussen zoutreffen';
+$labels['filteranyof'] = 'just eng vun de Reegele muss zoutreffen';
+$labels['filterany'] = 'all d\'Messagen';
+$labels['filtercontains'] = 'enthält';
+$labels['filternotcontains'] = 'enthält net';
+$labels['filteris'] = 'ass gläich';
+$labels['filterisnot'] = 'ass net gläich';
+$labels['filterexists'] = 'existéiert';
+$labels['filternotexists'] = 'existéiert net';
+$labels['filterunder'] = 'ënner';
+$labels['filterover'] = 'iwwer';
+$labels['addrule'] = 'Reegel dobäisetzen';
+$labels['delrule'] = 'Reegel läschen';
+$labels['messagemoveto'] = 'Message verréckelen an';
+$labels['messageredirect'] = 'Message ëmleeden an';
+$labels['messagecopyto'] = 'Message kopéieren an';
+$labels['messagesendcopy'] = 'Kopie vum Message schécken un';
+$labels['messagereply'] = 'Mat dësem Message äntweren';
+$labels['messagedelete'] = 'Message läschen';
+$labels['add'] = 'Dobäisetzen';
+$labels['del'] = 'Läschen';
+$labels['sender'] = 'Ofsender';
+$labels['recipient'] = 'Empfänger';
+?>