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, 85 insertions, 0 deletions

diff --git a/plugins/managesieve/localization/fa_AF.inc b/plugins/managesieve/localization/fa_AF.inc
new file mode 100644
index 000000000..87967958e
--- /dev/null
+++ b/plugins/managesieve/localization/fa_AF.inc
@@ -0,0 +1,85 @@
+<?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'] = 'فیلترها';
+$labels['filtername'] = 'نام فیلتر';
+$labels['newfilter'] = 'فیلتر جدید';
+$labels['filteranyof'] = 'تطبیق با هر کدام از رول های زیر';
+$labels['filterany'] = 'تمام پیام ها';
+$labels['filtercontains'] = 'شامل';
+$labels['filteris'] = 'مساوی با';
+$labels['filterunder'] = 'زیر';
+$labels['filterover'] = 'بالای';
+$labels['addrule'] = 'افزودن نقش';
+$labels['delrule'] = 'حذف نقش';
+$labels['messagereply'] = 'پاسخ توسط پیام';
+$labels['messagedelete'] = 'حذف پیام';
+$labels['add'] = 'افزودن';
+$labels['del'] = 'حذف';
+$labels['sender'] = 'فرستنده';
+$labels['recipient'] = 'گیرنده';
+$labels['days'] = 'روز';
+$labels['filtersets'] = 'مجموعه فیلتر';
+$labels['filterdef'] = 'تعریف فیلتر';
+$labels['newfilterset'] = 'مجموعه فیلترهای جدید';
+$labels['active'] = 'فعال';
+$labels['none'] = 'هیچ کدام';
+$labels['flagread'] = 'خواندن';
+$labels['flagdeleted'] = 'حذف شد';
+$labels['flagflagged'] = 'نشانه گذاری شده';
+$labels['flagdraft'] = 'پیش نویس';
+$labels['varlength'] = 'طول';
+$labels['notifyimportancenormal'] = 'عادی';
+$labels['notifymethodmailto'] = 'ایمیل';
+$labels['nextstep'] = 'مرحله بعدی';
+$labels['...'] = '...';
+$labels['currdate'] = 'تاریخ کنونی';
+$labels['datetest'] = 'تاریخ';
+$labels['dateheader'] = 'سرایند:';
+$labels['year'] = 'سال';
+$labels['month'] = 'ماه';
+$labels['day'] = 'روز';
+$labels['second'] = 'ثانیه';
+$labels['address'] = 'آدرس';
+$labels['envelope'] = 'پاکت نامه';
+$labels['modifier'] = 'ویرایش کننده:';
+$labels['text'] = 'متن';
+$labels['contenttype'] = 'نوع محتوا';
+$labels['allparts'] = 'همه';
+$labels['domain'] = 'دامنه';
+$labels['localpart'] = 'جز محلی';
+$labels['user'] = 'کاربر';
+$labels['detail'] = 'جزئیات';
+$labels['comparator'] = 'مقایسه کننده:';
+$labels['default'] = 'پیش فرض';
+$labels['index'] = 'اندیس';
+$labels['vacation'] = 'تعطیلات';
+$labels['vacation.reply'] = 'پیام پاسخ';
+$labels['vacation.advanced'] = 'تنظیمات پیشرفته';
+$labels['vacation.subject'] = 'موضوع';
+$labels['vacation.body'] = 'متن پیام';
+$labels['vacation.status'] = 'وضعیت';
+$labels['vacation.on'] = 'فعال';
+$labels['vacation.off'] = 'غیرفعال';
+$labels['arialabelfilterform'] = 'خصوصیات فیلترها';
+$labels['ariasummaryfilterslist'] = 'لیست فیلترها';
+$messages['filterdeleted'] = 'فیلتر با موفقیت حذف شد.';
+$messages['filtersaved'] = 'فیلتر با موفقیت ذخیره شد.';
+$messages['deactivated'] = 'فیلتر(ها) با موفقیت غیر فعال شدند';
+$messages['nametoolong'] = 'نام بسیار بلند است.';
+$messages['namereserved'] = 'نام  رزرو شده.';
+?>