Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1923)
+++ branches/2.8.x/CHANGELOG	(revision 1924)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+08 Jun-2013 Build 1924 Werner v.d.Decken(DarkViper)
+! syncronize project and some small typo corrections in /admin/
 08 Jun-2013 Build 1923 Werner v.d.Decken(DarkViper)
 ! syncronize project
 # some small corrections in /admin/
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1923)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1924)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1923');
+if(!defined('REVISION')) define('REVISION', '1924');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/account/confirm.php
===================================================================
--- branches/2.8.x/wb/account/confirm.php	(revision 1923)
+++ branches/2.8.x/wb/account/confirm.php	(revision 1924)
@@ -16,6 +16,8 @@
  */
 
 require_once('../config.php');
+$mLang = Translate::getinstance();
+$mLang->enableAddon('account');
 
 if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
 
@@ -27,9 +29,6 @@
 // load module language file
 //$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE);
 
-$mLang = ModLanguage::getInstance();
-$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
-
 //$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php';
 //require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir );
 
@@ -63,14 +62,14 @@
 define('ROOT_PARENT', $root_parent);
 define('PARENT', 0);
 define('LEVEL', $level);
-define('PAGE_TITLE', $TEXT['SIGNUP']);
-define('MENU_TITLE', $TEXT['SIGNUP']);
+define('PAGE_TITLE', $mLang->TEXT_SIGNUP);
+define('MENU_TITLE', $mLang->TEXT_SIGNUP);
 define('MODULE', '');
 define('VISIBILITY', 'public');
 
 define('PAGE_CONTENT', WB_PATH.'/account/confirm_form.php');
 
-
+$mLang->disableAddon();
 // Include the index (wrapper) file
 require(WB_PATH.'/index.php');
 
Index: branches/2.8.x/wb/account/confirm_form.php
===================================================================
--- branches/2.8.x/wb/account/confirm_form.php	(revision 1923)
+++ branches/2.8.x/wb/account/confirm_form.php	(revision 1924)
@@ -25,7 +25,8 @@
 	require_once(dirname(__FILE__).'/AccountSignup.php');
 
     	// load module language file
-    	$mLang = ModLanguage::getInstance();
+    	$mLang = Translate::getInstance();
+		$mLang->enableAddon('account');
 
 		$sConfirmationId = ( isset($_GET['id']) ? $_GET['id'] : ( isset($_POST['confirm_code']) ? $_POST['confirm_code'] : '' ) );
 		$sSubmitAction = 'show'; // default action
Index: branches/2.8.x/wb/account/confirm_mails.php
===================================================================
--- branches/2.8.x/wb/account/confirm_mails.php	(revision 1923)
+++ branches/2.8.x/wb/account/confirm_mails.php	(revision 1924)
@@ -46,7 +46,8 @@
 }
 
 // load module language file
-$mLang = ModLanguage::getInstance();
+$mLang = Translate::getInstance();
+$mLang->enableAddon('account');
 //WB_MAILER settings
 $sServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : emailAdmin());
 $sWebMailer   = (defined('WBMAILER_DEFAULT_SENDERNAME') && WBMAILER_DEFAULT_SENDERNAME != '' ? WBMAILER_DEFAULT_SENDERNAME : 'WebsiteBaker Mailer');
Index: branches/2.8.x/wb/account/signup_form.php
===================================================================
--- branches/2.8.x/wb/account/signup_form.php	(revision 1923)
+++ branches/2.8.x/wb/account/signup_form.php	(revision 1924)
@@ -24,15 +24,15 @@
 /* -------------------------------------------------------- */
 
 // load module language file
-$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
-require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
+//$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
+//require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
 
 require_once(WB_PATH.'/include/captcha/captcha.php');
 
 include_once (WB_PATH.'/framework/functions.php');
 
-$mLang = ModLanguage::getInstance();
-$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
+$mLang = Translate::getinstance();
+$mLang->enableAddon('account');
 
 if(isset($_POST['action']) && $_POST['action']=='send') {
 	require(dirname(__FILE__).'/save_signup.php');
@@ -70,11 +70,11 @@
 		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
 		'MESSAGE_VALUE' => '',
 		'ERROR_VALUE' => '',
-		'HEADING_SIGNUP' => $TEXT['SIGNUP'],
-		'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
-		'TEXT_SIGNUP' => $TEXT['SIGNUP'],
-		'TEXT_RESET' => $TEXT['RESET'],
-		'TEXT_CANCEL' => $TEXT['CANCEL'],
+		'HEADING_SIGNUP' => $mLang->TEXT_SIGNUP,
+		'TEXT_LANGUAGE' => $mLang->TEXT_LANGUAGE,
+		'TEXT_SIGNUP' => $mLang->TEXT_SIGNUP,
+		'TEXT_RESET' => $mLang->TEXT_RESET,
+		'TEXT_CANCEL' => $mLang->TEXT_CANCEL,
 		)
 	);
 
@@ -102,10 +102,10 @@
 
 // login label vars
 	$oTpl->set_var(array(
-		'TEXT_INFO' => $TEXT['INFO'],
-		'TEXT_USERNAME' => $TEXT['USERNAME'],
-		'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
-		'TEXT_EMAIL' => $TEXT['EMAIL'],
+		'TEXT_INFO' => $mLang->TEXT_INFO,
+		'TEXT_USERNAME' => $mLang->TEXT_USERNAME,
+		'TEXT_DISPLAY_NAME' => $mLang->TEXT_DISPLAY_NAME,
+		'TEXT_EMAIL' => $mLang->TEXT_EMAIL,
 		)
 	);
 
@@ -169,9 +169,9 @@
 	if(CONFIRMED_REGISTRATION) {
 		$oTpl->parse('captcha', '', true);
 		$oTpl->set_var(array(
-				'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
-				'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
-				'HELP_SIGNUP_REMEMBER_PASSWORD' => $HELP['SIGNUP_REMEMBER_PASSWORD'],
+				'TEXT_NEW_PASSWORD' => $mLang->TEXT_NEW_PASSWORD,
+				'TEXT_RETYPE_NEW_PASSWORD' => $mLang->TEXT_RETYPE_NEW_PASSWORD,
+				'HELP_SIGNUP_REMEMBER_PASSWORD' => $mLang->HELP_SIGNUP_REMEMBER_PASSWORD,
 				)
 			);
 		$oTpl->parse('password', 'password_block',true);
@@ -182,7 +182,7 @@
 			call_captcha();
 			$captcha = ob_get_clean();
 			$oTpl->set_var(array(
-					'TEXT_VERIFICATION' => $TEXT['VERIFICATION'],
+					'TEXT_VERIFICATION' => $mLang->TEXT_VERIFICATION,
 					'CAPTCHA' => $captcha,
 					)
 				);
@@ -214,18 +214,18 @@
 		$oTpl->parse('message', 'show_registration_block', true);
 	}
 	$oTpl->set_var(array(
-			'BACK' => $TEXT['BACK'],
+			'BACK' => $mLang->TEXT_BACK,
 			'HTTP_REFERER' => isset($_SESSION['HTTP_REFERER']) ? $_SESSION['HTTP_REFERER'] : WB_URL,
 			)
 		);
 
 	if(CONFIRMED_REGISTRATION) {
-		$sMessage  = $MESSAGE['SIGNUP2_SUBJECT_NEW_USER'].' ';
-		$sMessage .= $MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'];
+		$sMessage  = $mLang->MESSAGE_SIGNUP2_SUBJECT_NEW_USER.' ';
+		$sMessage .= $mLang->MESSAGE_SIGNUP_CONFIRMED_REGISTRATION;
 		$oTpl->set_var('MESSAGE',$sMessage);
 	} else {
-		$sMessage  = $MESSAGE['SIGNUP2_SUBJECT_NEW_USER'].' ';
-		$sMessage .= $MESSAGE['SIGNUP_REGISTRATION'];
+		$sMessage  = $mLang->MESSAGE_SIGNUP2_SUBJECT_NEW_USER.' ';
+		$sMessage .= $mLang->MESSAGE_SIGNUP_REGISTRATION;
 		$oTpl->set_var('MESSAGE',$sMessage);
 	}
 	//$oTpl->parse('message', 'message_block', true);
