Index: /CKEditor/branches/features/aria/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/colorbutton/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/colorbutton/plugin.js	(revision 5064)
@@ -33,5 +33,5 @@
 					{
 						css : editor.skin.editor.css,
-						aria : { role : 'listbox', 'aria-label' : lang.panelTitle }
+						attributes : { role : 'listbox', 'aria-label' : lang.panelTitle }
 					},
 
Index: /CKEditor/branches/features/aria/_source/plugins/contextmenu/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/contextmenu/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/contextmenu/plugin.js	(revision 5064)
@@ -42,5 +42,5 @@
 			{
 				className : editor.skinClass + ' cke_contextmenu',
-				aria :
+				attributes :
 				{
 					'aria-label' : editor.lang.common.options
Index: /CKEditor/branches/features/aria/_source/plugins/font/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/font/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/font/plugin.js	(revision 5064)
@@ -36,5 +36,5 @@
 					css : editor.skin.editor.css.concat( config.contentsCss ),
 					multiSelect : false,
-					aria : { 'aria-label' : lang.panelTitle }
+					attributes : { 'aria-label' : lang.panelTitle }
 				},
 
Index: /CKEditor/branches/features/aria/_source/plugins/format/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/format/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/format/plugin.js	(revision 5064)
@@ -33,5 +33,5 @@
 					css : editor.skin.editor.css.concat( config.contentsCss ),
 					multiSelect : false,
-					aria : { 'aria-label' : lang.panelTitle }
+					attributes : { 'aria-label' : lang.panelTitle }
 				},
 
Index: /CKEditor/branches/features/aria/_source/plugins/listblock/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/listblock/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/listblock/plugin.js	(revision 5064)
@@ -10,7 +10,7 @@
 	onLoad : function()
 	{
-		CKEDITOR.ui.panel.prototype.addListBlock = function( name, multiSelect )
+		CKEDITOR.ui.panel.prototype.addListBlock = function( name, definiton )
 		{
-			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), multiSelect ) );
+			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definiton ) );
 		};
 
@@ -23,9 +23,9 @@
 					blockDefinition = blockDefinition || {};
 
-					var aria = blockDefinition.aria || ( blockDefinition.aria = {} );
+					var attribs = blockDefinition.attributes || ( blockDefinition.attributes = {} );
 					( this.multiSelect = !!blockDefinition.multiSelect ) &&
-						( aria[ 'aria-multiselectable' ] = true );
+						( attribs[ 'aria-multiselectable' ] = true );
 					// Provide default role of 'listbox'.
-					!aria.role && ( aria.role = 'listbox' );
+					!attribs.role && ( attribs.role = 'listbox' );
 					
 					// Call the base contructor.
Index: /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js	(revision 5064)
@@ -263,6 +263,7 @@
 
 		blockDefinition = blockDefinition || {};
-		var aria = blockDefinition.aria;
-		aria && this.element.setAttributes( aria );
+
+		var attribs = blockDefinition.attributes;
+		attribs && this.element.setAttributes( attribs );
 
 		CKEDITOR.fire( 'ariaWidget', this.element );
Index: /CKEditor/branches/features/aria/_source/plugins/panelbutton/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/panelbutton/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/panelbutton/plugin.js	(revision 5064)
@@ -60,5 +60,5 @@
 			panelDefinition.block =
 			{
-				aria : panelDefinition.aria
+				attributes : panelDefinition.attributes
 			};
 
Index: /CKEditor/branches/features/aria/_source/plugins/richcombo/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/richcombo/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/richcombo/plugin.js	(revision 5064)
@@ -48,5 +48,5 @@
 		{
 			multiSelect : panelDefinition.multiSelect,
-			aria : panelDefinition.aria
+			attributes : panelDefinition.attributes
 		};
 
@@ -171,5 +171,5 @@
 			output.push(
 				'>' +
-					'<span id="' + id+ '_label" class=cke_label>', this.label, '</span>' +
+					'<span id="' + id+ '_label" class=cke_label>', this.label, '</span>',
 					'<a hidefocus=true title="', this.title, '" tabindex="-1"',
 						env.gecko && env.version >= 10900 && !env.hc ? '' : ' href="javascript:void(\'' + this.label + '\')"',
@@ -199,5 +199,5 @@
 							'<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
 						'</span>' +
-						'<span class=cke_openbutton><span>&#9660;</span></span>' +		//¨‹
+						'<span class=cke_openbutton><span>&#9660;</span></span>' +	// BLACK DOWN-POINTING TRIANGLE
 					'</a>' +
 				'</span>' +
Index: /CKEditor/branches/features/aria/_source/plugins/stylescombo/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/stylescombo/plugin.js	(revision 5063)
+++ /CKEditor/branches/features/aria/_source/plugins/stylescombo/plugin.js	(revision 5064)
@@ -27,5 +27,5 @@
 						css : editor.skin.editor.css.concat( config.contentsCss ),
 						multiSelect : true,
-						aria : { 'aria-label' : lang.panelTitle }
+						attributes : { 'aria-label' : lang.panelTitle }
 					},