Index: /CKEditor/branches/features/aria/_source/lang/en.js
===================================================================
--- /CKEditor/branches/features/aria/_source/lang/en.js	(revision 5038)
+++ /CKEditor/branches/features/aria/_source/lang/en.js	(revision 5039)
@@ -484,11 +484,5 @@
 		toolbar	: 'Smiley',
 		title	: 'Insert a Smiley',
-		smileyEmotionsLabel : 'Emotion options',
-		smileyLabels :
-		[
-			'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
-			'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
-			'yes', 'heart', 'broken heart', 'kiss', 'mail'
-		]
+		smileyEmotionsLabel : 'Emotion options'
 	},
 
Index: /CKEditor/branches/features/aria/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/smiley/dialogs/smiley.js	(revision 5038)
+++ /CKEditor/branches/features/aria/_source/plugins/smiley/dialogs/smiley.js	(revision 5039)
@@ -160,5 +160,5 @@
 						( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ),
 					'>' +
-					'<span id="cke_smile_label_' + i + '" class="cke_label">' +lang.smileyLabels[ i ]  + '</span>' +
+					'<span id="cke_smile_label_' + i + '" class="cke_label">' +config.smiley_descriptions[ i ]  + '</span>' +
 				'</a>',
  			'</td>' );
Index: /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js	(revision 5038)
+++ /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js	(revision 5039)
@@ -60,15 +60,18 @@
  * setting.
  * @type Array
- * @default (see example)
+ * @default  The textual descriptions of smiley.
  * @example
- * // The ASCII smileys are actually the default values.
+ * // Use the emoticons as descriptions..
  * config.smiley_descriptions = [
- *     ':)', ':(', ';)', ':D', ':/', ':P',
- *     '', '', '', '', '', '',
- *     '', ';(', '', '', '', '',
- *     '', ':kiss', '' ];
+ *	':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
+ *	':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
+ *	'', '', ':-*', '' ];
  */
-CKEDITOR.config.smiley_descriptions = [
-	':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
-	':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
-	'', '', ':-*', '' ];
+CKEDITOR.config.smiley_descriptions =
+	[
+		'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
+		'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
+		'yes', 'heart', 'broken heart', 'kiss', 'mail'
+	];
+
+