Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 477)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 478)
@@ -7,21 +7,21 @@
     private $debug = 0;
     private $excludedNamespaces;
-    private $nsToggles = array(
-    'fck_ns_main',
-    'fck_ns_talk',
-    'fck_ns_user',
-    'fck_ns_user_talk',
-    'fck_ns_project',
-    'fck_ns_project_talk',
-    'fck_ns_image',
-    'fck_ns_image_talk',
-    'fck_ns_mediawiki',
-    'fck_ns_mediawiki_talk',
-    'fck_ns_template',
-    'fck_ns_template_talk',
-    'fck_ns_help',
-    'fck_ns_help_talk',
-    'fck_ns_category',
-    'fck_ns_category_talk',
+    static $nsToggles = array(
+    'riched_disable_ns_main',
+    'riched_disable_ns_talk',
+    'riched_disable_ns_user',
+    'riched_disable_ns_user_talk',
+    'riched_disable_ns_project',
+    'riched_disable_ns_project_talk',
+    'riched_disable_ns_image',
+    'riched_disable_ns_image_talk',
+    'riched_disable_ns_mediawiki',
+    'riched_disable_ns_mediawiki_talk',
+    'riched_disable_ns_template',
+    'riched_disable_ns_template_talk',
+    'riched_disable_ns_help',
+    'riched_disable_ns_help_talk',
+    'riched_disable_ns_category',
+    'riched_disable_ns_category_talk',
     );
 
@@ -44,4 +44,9 @@
         }
     }
+    
+    public function name()
+    {
+    	
+    }
 
     private function getExcludedNamespaces()
@@ -51,7 +56,7 @@
         if ( is_null( $this->excludedNamespaces ) ) {
             $this->excludedNamespaces = array();
-            foreach ( $this->nsToggles as $toggle ) {
+            foreach ( self::$nsToggles as $toggle ) {
                 if ( $wgUser->getOption( $toggle ) ) {
-                    $this->excludedNamespaces[] = constant(strtoupper(str_replace("fck_", "", $toggle)));
+                    $this->excludedNamespaces[] = constant(strtoupper(str_replace("riched_disable_", "", $toggle)));
                 }
             }
@@ -113,5 +118,5 @@
         global $wgTitle, $wgUser;
 
-        if (!$wgUser->getOption( 'showtoolbar' ) || !$wgUser->getOption( 'fck_edit_enabled' )) {
+        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
             return true;
         }
@@ -140,5 +145,5 @@
         $List   = array();
 
-        if (!$wgUser->getOption( 'showtoolbar' ) || !$wgUser->getOption( 'fck_edit_enabled' )) {
+        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
             return true;
         }
@@ -286,5 +291,5 @@
         global $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
 
-        if (!$wgUser->getOption( 'showtoolbar' ) || !$wgUser->getOption( 'fck_edit_enabled' )) {
+        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
             return true;
         }
@@ -319,6 +324,6 @@
 
     public function onUserToggles( &$extraToggles ) {
-        $extraToggles[] = 'fck_edit_enabled';
-        $extraToggles = array_merge($extraToggles, $this->nsToggles);
+        $extraToggles[] = 'riched_disable';
+        $extraToggles = array_merge($extraToggles, self::$nsToggles);
         return true;
     }
Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.i18n.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.i18n.php	(revision 477)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.i18n.php	(revision 478)
@@ -3,42 +3,42 @@
 $allMessages = array(
         'en' => array( 
-                'textfckditor' => 'FCKeditor',
-                'tog-fck_edit_enabled' => 'Use FCKeditor instead of default edit toolbar (JavaScript)',
-                'tog-fck_ns_main' => 'Disable FCKeditor within the MediaWiki "Main" namespace',
-                'tog-fck_ns_talk' => 'Disable FCKeditor within the MediaWiki "Talk" namespace',
-                'tog-fck_ns_user' => 'Disable FCKeditor within the MediaWiki "User" namespace',
-                'tog-fck_ns_user_talk' => 'Disable FCKeditor within the MediaWiki "User Talk" namespace',
-                'tog-fck_ns_project' => 'Disable FCKeditor within the MediaWiki "Project" namespace',
-                'tog-fck_ns_project_talk' => 'Disable FCKeditor within the MediaWiki "Project Talk" namespace',
-                'tog-fck_ns_image' => 'Disable FCKeditor within the MediaWiki "Image" namespace',
-                'tog-fck_ns_image_talk' => 'Disable FCKeditor within the MediaWiki "Image Talk" namespace',
-                'tog-fck_ns_mediawiki' => 'Disable FCKeditor within the MediaWiki "MediaWiki" namespace',
-                'tog-fck_ns_mediawiki_talk' => 'Disable FCKeditor within the MediaWiki "MediaWiki Talk" namespace',
-                'tog-fck_ns_template' => 'Disable FCKeditor within the MediaWiki "Template" namespace',
-                'tog-fck_ns_template_talk' => 'Disable FCKeditor within the MediaWiki "Template Talk" namespace',
-                'tog-fck_ns_help' => 'Disable FCKeditor within the MediaWiki "Help" namespace',
-                'tog-fck_ns_help_talk' => 'Disable FCKeditor within the MediaWiki "Help Talk" namespace',
-                'tog-fck_ns_category' => 'Disable FCKeditor within the MediaWiki "Category" namespace',
-                'tog-fck_ns_category_talk' => 'Disable FCKeditor within the MediaWiki "Category Talk" namespace',
+                'textrichditor' => 'Rich Editor',
+                'tog-riched_disable' => 'Disable rich editor',
+                'tog-riched_disable_ns_main' => 'Disable rich editor within the MediaWiki "Main" namespace',
+                'tog-riched_disable_ns_talk' => 'Disable rich editor within the MediaWiki "Talk" namespace',
+                'tog-riched_disable_ns_user' => 'Disable rich editor within the MediaWiki "User" namespace',
+                'tog-riched_disable_ns_user_talk' => 'Disable rich editor within the MediaWiki "User Talk" namespace',
+                'tog-riched_disable_ns_project' => 'Disable rich editor within the MediaWiki "Project" namespace',
+                'tog-riched_disable_ns_project_talk' => 'Disable rich editor within the MediaWiki "Project Talk" namespace',
+                'tog-riched_disable_ns_image' => 'Disable rich editor within the MediaWiki "Image" namespace',
+                'tog-riched_disable_ns_image_talk' => 'Disable rich editor within the MediaWiki "Image Talk" namespace',
+                'tog-riched_disable_ns_mediawiki' => 'Disable rich editor within the MediaWiki "MediaWiki" namespace',
+                'tog-riched_disable_ns_mediawiki_talk' => 'Disable rich editor within the MediaWiki "MediaWiki Talk" namespace',
+                'tog-riched_disable_ns_template' => 'Disable rich editor within the MediaWiki "Template" namespace',
+                'tog-riched_disable_ns_template_talk' => 'Disable rich editor within the MediaWiki "Template Talk" namespace',
+                'tog-riched_disable_ns_help' => 'Disable rich editor within the MediaWiki "Help" namespace',
+                'tog-riched_disable_ns_help_talk' => 'Disable rich editor within the MediaWiki "Help Talk" namespace',
+                'tog-riched_disable_ns_category' => 'Disable rich editor within the MediaWiki "Category" namespace',
+                'tog-riched_disable_ns_category_talk' => 'Disable rich editor within the MediaWiki "Category Talk" namespace',
         ),
         'pl' => array( 
-                'textfckditor' => 'FCKeditor',
-                'tog-fck_edit_enabled' => 'Użyj FCKeditora zamiast domyślnego toolbara (JavaScript)',
-                'tog-fck_ns_main' => 'Disable FCKeditor within the MediaWiki "Main" namespace',
-                'tog-fck_ns_talk' => 'Disable FCKeditor within the MediaWiki "Talk" namespace',
-                'tog-fck_ns_user' => 'Disable FCKeditor within the MediaWiki "User" namespace',
-                'tog-fck_ns_user_talk' => 'Disable FCKeditor within the MediaWiki "User Talk" namespace',
-                'tog-fck_ns_project' => 'Disable FCKeditor within the MediaWiki "Project" namespace',
-                'tog-fck_ns_project_talk' => 'Disable FCKeditor within the MediaWiki "Project Talk" namespace',
-                'tog-fck_ns_image' => 'Disable FCKeditor within the MediaWiki "Image" namespace',
-                'tog-fck_ns_image_talk' => 'Disable FCKeditor within the MediaWiki "Image Talk" namespace',
-                'tog-fck_ns_mediawiki' => 'Disable FCKeditor within the MediaWiki "MediaWiki" namespace',
-                'tog-fck_ns_mediawiki_talk' => 'Disable FCKeditor within the MediaWiki "MediaWiki Talk" namespace',
-                'tog-fck_ns_template' => 'Disable FCKeditor within the MediaWiki "Template" namespace',
-                'tog-fck_ns_template_talk' => 'Disable FCKeditor within the MediaWiki "Template Talk" namespace',
-                'tog-fck_ns_help' => 'Disable FCKeditor within the MediaWiki "Help" namespace',
-                'tog-fck_ns_help_talk' => 'Disable FCKeditor within the MediaWiki "Help Talk" namespace',
-                'tog-fck_ns_category' => 'Disable FCKeditor within the MediaWiki "Category" namespace',
-                'tog-fck_ns_category_talk' => 'Disable FCKeditor within the MediaWiki "Category Talk" namespace',
+                'textrichditor' => 'Rich Editor',
+                'tog-riched_disable' => 'Użyj rich editora zamiast domyślnego toolbara (JavaScript)',
+                'tog-riched_disable_ns_main' => 'Disable rich editor within the MediaWiki "Main" namespace',
+                'tog-riched_disable_ns_talk' => 'Disable rich editor within the MediaWiki "Talk" namespace',
+                'tog-riched_disable_ns_user' => 'Disable rich editor within the MediaWiki "User" namespace',
+                'tog-riched_disable_ns_user_talk' => 'Disable rich editor within the MediaWiki "User Talk" namespace',
+                'tog-riched_disable_ns_project' => 'Disable rich editor within the MediaWiki "Project" namespace',
+                'tog-riched_disable_ns_project_talk' => 'Disable rich editor within the MediaWiki "Project Talk" namespace',
+                'tog-riched_disable_ns_image' => 'Disable rich editor within the MediaWiki "Image" namespace',
+                'tog-riched_disable_ns_image_talk' => 'Disable rich editor within the MediaWiki "Image Talk" namespace',
+                'tog-riched_disable_ns_mediawiki' => 'Disable rich editor within the MediaWiki "MediaWiki" namespace',
+                'tog-riched_disable_ns_mediawiki_talk' => 'Disable rich editor within the MediaWiki "MediaWiki Talk" namespace',
+                'tog-riched_disable_ns_template' => 'Disable rich editor within the MediaWiki "Template" namespace',
+                'tog-riched_disable_ns_template_talk' => 'Disable rich editor within the MediaWiki "Template Talk" namespace',
+                'tog-riched_disable_ns_help' => 'Disable rich editor within the MediaWiki "Help" namespace',
+                'tog-riched_disable_ns_help_talk' => 'Disable rich editor within the MediaWiki "Help Talk" namespace',
+                'tog-riched_disable_ns_category' => 'Disable rich editor within the MediaWiki "Category" namespace',
+                'tog-riched_disable_ns_category_talk' => 'Disable rich editor within the MediaWiki "Category Talk" namespace',
         )
 );
Index: /MediaWiki/trunk/includes/SpecialPreferences.php
===================================================================
--- /MediaWiki/trunk/includes/SpecialPreferences.php	(revision 477)
+++ /MediaWiki/trunk/includes/SpecialPreferences.php	(revision 478)
@@ -853,5 +853,5 @@
 				'editwidth',
 				'showtoolbar',
-				'fck_edit_enabled',
+				'riched_disable',
 				'previewonfirst',
 				'previewontop',
@@ -867,23 +867,6 @@
 		#
 		if ($wgUser->getOption( 'fck_edit_enabled' )) {
-		  $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textfckditor' ) . '</legend>' .			 			
-			 $this->getToggles( array(
-                'fck_ns_main',
-                'fck_ns_talk',
-                'fck_ns_user',
-                'fck_ns_user_talk',
-                'fck_ns_project',
-                'fck_ns_project_talk',
-                'fck_ns_image',
-                'fck_ns_image_talk',
-                'fck_ns_mediawiki',
-                'fck_ns_mediawiki_talk',
-                'fck_ns_template',
-                'fck_ns_template_talk',
-                'fck_ns_help',
-                'fck_ns_help_talk',
-                'fck_ns_category',
-                'fck_ns_category_talk',
-			) ) . '</fieldset>'
+		  $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textrichditor' ) . '</legend>' .			 			
+			 $this->getToggles( FCKeditor::$nsToggles ) . '</fieldset>'
 		  );
 		}