Index: /CKEditor/branches/prototype/_source/lang/en.js
===================================================================
--- /CKEditor/branches/prototype/_source/lang/en.js	(revision 2998)
+++ /CKEditor/branches/prototype/_source/lang/en.js	(revision 2999)
@@ -358,4 +358,10 @@
 	},
 
+	smiley :
+	{
+		toolbar	: 'Smiley',
+		title	: 'Insert a Smiley'
+	},
+
 	elementsPath :
 	{
Index: /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js	(revision 2998)
+++ /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js	(revision 2999)
@@ -80,6 +80,6 @@
 	return {
 		title : editor.lang.smiley.title,
-		minWidth : config.windowWidth,
-		minHeight : config.windowHeight,
+		minWidth : 320,
+		minHeight : 210,
 		contents : [
 			{
Index: /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js	(revision 2998)
+++ /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js	(revision 2999)
@@ -6,4 +6,6 @@
 CKEDITOR.plugins.add( 'smiley',
 {
+	requires : [ 'dialog' ],
+
 	init : function( editor, pluginPath )
 	{
@@ -15,29 +17,18 @@
 			});
 		CKEDITOR.dialog.add( 'smiley', this.path + 'dialogs/smiley.js' );
-	},
-
-	lang : [ 'en' ]
+	}
 } );
 
 CKEDITOR.config.smiley =
 {
-	// TODO: update descriptions, fix coding style.
-	/**
-	 * List of smiley images displayed in the Smiley dialog.
-	 * @type Array
-	 * @default ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
-	 * @example
-	 * config.smileyImages = [ 'tounge.gif', 'smile.gif', 'laugh.gif' ];
-	 */
+	path : CKEDITOR.basePath +  '_source/plugins/smiley/images/',
+
 	images : [ 'regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif',
 	'embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif',
 	'devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif',
 	'broken_heart.gif','kiss.gif','envelope.gif'],
+
 	descriptions : [ ':)', ':(', ';)', ':D', ':/', ':P', '', '', '', '', '', '', '', ';(', '', '', '', '', ':kiss', '', ],
 
-	//TODO: update path
-	path : CKEDITOR.basePath +  '_source/plugins/smiley/images/',
-	windowWidth : 320,
-	windowHeight : 210,
 	columns : 8
 };