<<<<<<< HEAD
﻿/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

CKEDITOR.plugins.setLang( 'uicolor', 'en',
{
	uicolor :
	{
		title : 'UI Color Picker',
		preview : 'Live preview',
		config : 'Paste this string into your config.js file',
		predefined : 'Predefined color sets'
	}
});
=======
﻿/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

CKEDITOR.plugins.setLang( 'uicolor', 'en',
{
	uicolor :
	{
		title : 'UI Color Picker',
		preview : 'Live preview',
		config : 'Paste this string into your config.js file',
		predefined : 'Predefined color sets'
	}
});
>>>>>>> origin/master
