Index: /CKEditor/branches/features/aria/_source/core/config.js
===================================================================
--- /CKEditor/branches/features/aria/_source/core/config.js	(revision 5053)
+++ /CKEditor/branches/features/aria/_source/core/config.js	(revision 5054)
@@ -213,5 +213,5 @@
 	 * @example
 	 */
-	plugins : 'about,accessibility,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+	plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
 	/**
Index: /CKEditor/branches/features/aria/_source/plugins/a11ycompat/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/a11ycompat/plugin.js	(revision 5054)
+++ /CKEditor/branches/features/aria/_source/plugins/a11ycompat/plugin.js	(revision 5054)
@@ -0,0 +1,140 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Bring better accessibility support to browsers that has limited support for modern technologies (e.g. ARIA).
+ */
+
+(function()
+{
+	var dtd = CKEDITOR.dtd,
+		env = CKEDITOR.env;
+
+	// List of in-use ARIA roles and states. 
+	var roles = [ 'role' ],
+		 // List of roles that role type should not be announced.
+		 silentRoles = { 'region' : 1 },
+		 states = [ 'label', 'labelledby', 'describedby', 'multiline' ],
+		 length = Math.max( roles.length, states.length );
+
+	function lookupARIASupport( role, tagName )
+	{
+		return {
+				'dialog' :	 env.gecko && env.version >= 10900,
+				'region' : env.gecko && env.version >= 10900
+			}[ role ];
+	}
+
+	/**
+	 *  Bring degradeable substitution to standard ARIA widgets.  
+	 * @param element
+	 */
+	function degradeARIA( element, editor )
+	{
+		// Save the interested ARIA attributes first.
+		var doc = element.getDocument(),
+			role = element.getAttribute( 'role' ) || '';
+
+		// Just leave the original element untouched if
+		// the role is already supported on it.
+		if ( lookupARIASupport( role, element.getName() ) !== false )
+			return;
+
+		var attrValue,
+			labelText = element.getAttribute( 'aria-label' ) || ( attrValue = element.getAttribute( 'aria-labelledby' ) ) && doc.getById( attrValue ).getText() || '',
+			descriptionText = ( attrValue = element.getAttribute( 'aria-describedby' ) ) && doc.getById( attrValue ).getText() || '',
+			allInOne = [ labelText, role in silentRoles ? '' : role, descriptionText ].join( ' ' );
+
+		// Remove all ARIA attributes on the widget that could
+		// bring down or conflict with the degradtion label.
+		for ( var i = 0; i < length; i++ )
+		{
+			roles[ i ] && element.removeAttribute( roles[ i ] );
+			states[ i ] && element.removeAttribute( 'aria-' + states[ i ] );
+		}
+
+		// Translate 'dialog' role by wrapping all containing form fields with a legend that composed of all ARIA
+		// attributes of the dialog which leads to be announced by ATs.
+		if ( role == 'dialog' )
+		{
+			var fieldset = CKEDITOR.dom.element.createFromHtml(
+					'<fieldset style="position: relative;height: 100%;">' +
+						'<legend class="cke_voice_label">' +
+							CKEDITOR.tools.htmlEncode( allInOne ) +
+						'</legend>' +
+					'</fieldset>', doc );
+
+			var parent;
+			while( ( parent = element.getParent() ) && !parent.getDtd()[ fieldset.getName() ] )
+				element = parent;
+			fieldset.insertBefore( element );
+			fieldset.append( element );
+		}
+		// The only reliable substitution of aria-label on an iframe
+		// is to use the content window title of that frame.
+		else if ( element.is( 'iframe' ) )
+		{
+			doc = element.$.contentWindow.document;
+			var title = doc.title;
+
+			// Backup the title and restore it before running into use.
+			title && editor.on( 'beforeModeUnload', function() { doc.title = title; } );
+			doc.title = allInOne;
+		}
+	}
+
+	CKEDITOR.plugins.add( 'a11ycompat',
+	{
+		init : function( editor )
+		{
+			editor.on( 'ariaWidget', function( evt )
+				{
+					degradeARIA( evt.data, editor );
+				});
+
+			if ( !( env.gecko && env.version >= 10900 ) )
+			{
+				var uiButtonProto = CKEDITOR.ui.button.prototype;
+				uiButtonProto.setState = CKEDITOR.tools.override( uiButtonProto.setState, function( org )
+					{
+						return function( state )
+						{
+							if ( org.apply( this, arguments ) )
+							{
+								var element = CKEDITOR.document.getById( this._.id ),
+									htmlTitle = this.title,
+									unavailableLabel = this._.editor.lang.common.unavailable,
+									labelElement = element.getChild( 1 );
+
+								state == CKEDITOR.TRISTATE_DISABLED && ( htmlTitle = unavailableLabel.replace( '%1', this.title ) );
+								labelElement.setHtml( htmlTitle );
+							}
+						};
+					});
+			}
+
+			// IE doesn't support 'aria-label', use 'aria-labelledby' instead.
+			if ( CKEDITOR.env.ie )
+			{
+				CKEDITOR.on( 'ariaWidget', function( evt )
+					{
+						var target = evt.data,
+							ariaLabel;
+
+						if ( ( ariaLabel = target.getAttribute( 'aria-label' ) ) )
+						{
+							var labelId = 'cke_label_' + CKEDITOR.tools.getNextNumber();
+							ariaLabel = CKEDITOR.dom.element.createFromHtml(
+									'<span class="cke_label" id="' + labelId + '">' + ariaLabel+ '</span>',
+									target.getDocument() );
+							ariaLabel.insertBefore( target );
+							target.removeAttribute( 'aria-label' );
+							target.setAttribute( 'aria-labelledby', labelId );
+						}
+					});
+			}
+		}
+	});
+})();