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

diff --git a/plugins/managesieve/localization/th_TH.inc b/plugins/managesieve/localization/th_TH.inc
new file mode 100644
index 000000000..c2d041cfe
--- /dev/null
+++ b/plugins/managesieve/localization/th_TH.inc
@@ -0,0 +1,45 @@
+<?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['filteradd'] = 'เพิ่มตัวกรองข้อมูล';
+$labels['filterdel'] = 'ลบตัวกรองข้อมูล';
+$labels['moveup'] = 'เลื่อนขึ้น';
+$labels['movedown'] = 'เลื่อนลง';
+$labels['filterany'] = 'ข้อความทั้งหมด';
+$labels['filtercontains'] = 'ที่มีคำว่า';
+$labels['filternotcontains'] = 'ไม่มีคำว่า';
+$labels['filteris'] = 'ที่มีค่าเท่ากับ';
+$labels['filterisnot'] = 'ที่มีค่าไม่เท่ากับ';
+$labels['addrule'] = 'เพิ่มกฏ';
+$labels['delrule'] = 'ลบกฏ';
+$labels['messagemoveto'] = 'ย้ายข้อความไปที่';
+$labels['messageredirect'] = 'เปลียนเส้นทางข้อความไปที่';
+$labels['messagecopyto'] = 'คัดลอกข้อความไปที่';
+$labels['messagesendcopy'] = 'ส่งข้อความคัดลอกไปที่';
+$labels['messagedelete'] = 'ลบข้อความ';
+$labels['messagediscard'] = 'ยกเลิกข้อความ';
+$labels['messagesrules'] = 'สำหรับอีเมลขาเข้า:';
+$labels['add'] = 'เพิ่ม';
+$labels['del'] = 'ลบ';
+$labels['sender'] = 'ผู้ส่ง';
+$labels['recipient'] = 'ผู้รับ';
+$labels['vacationsubject'] = 'หัวเรื่องข้อความ:';
+$labels['enable'] = 'เปิดใช้งาน/ปิดใช้งาน';
+?>