Index: /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js	(revision 2832)
+++ /CKEditor/branches/prototype/_source/plugins/smiley/dialogs/smiley.js	(revision 2833)
@@ -77,5 +77,5 @@
 
 	return {
-		title : editor.lang.smileyTitle,
+		title : editor.lang.smiley.title,
 		minWidth : editor.config.smileyWindowWidth,
 		minHeight : editor.config.smileyWindowHeight,
Index: /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js	(revision 2832)
+++ /CKEditor/branches/prototype/_source/plugins/smiley/lang/en.js	(revision 2833)
@@ -22,5 +22,8 @@
 CKEDITOR.plugins.setLang( 'smiley', 'en',
 {
-	smiley			: 'Smiley',
-	smileyTitle		: 'Insert a Smiley'
+	smiley :
+	{
+		toolbar			: 'Smiley',
+		title			: 'Insert a Smiley'
+	}
 });
Index: /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js	(revision 2832)
+++ /CKEditor/branches/prototype/_source/plugins/smiley/plugin.js	(revision 2833)
@@ -27,5 +27,5 @@
 		editor.ui.addButton( 'Smiley',
 			{
-				label : editor.lang.smiley,
+				label : editor.lang.smiley.toolbar,
 				command : 'smiley'
 			});