diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index 9b9a37f7a..a9d295427 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -442,7 +442,7 @@ class cron_admin_ui extends e_admin_ui
 				$obj = new $class_name;
 				if (method_exists($obj, $method_name))
 				{
-					$message = str_replace('[function]', $class_name." : ".$method_name, LAN_CRON_55);
+					$message = str_replace('[x]', $class_name." : ".$method_name, "Executing config function [b][x][/b]");
 					$mes->add($message, E_MESSAGE_DEBUG);
 					if ($return == 'boolean')
 					{
@@ -456,7 +456,7 @@ class cron_admin_ui extends e_admin_ui
 				}
 				else
 				{
-					$message = str_replace('[method]', $method_name."()", LAN_CRON_56);
+					$message = str_replace('[x]', $method_name."()", "Config function [b][x][/b] NOT found.");
 					$mes->add($message, E_MESSAGE_DEBUG);
 				}
 			}
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 42b49246f..6959be1a3 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -455,7 +455,7 @@ class system_tools
 		
 		if(!isset($POST['create_multisite']))
 		{
-			$info = str_replace('[domain]', e_DOMAIN, LANINS_133);
+			$info = str_replace('[x]', e_DOMAIN, LANINS_133);
 			$mes->addInfo($info);
 		}
 		
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 9b7753819..bb8792246 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -318,8 +318,8 @@ if($fp_update_prefs)
 	$corePrefs->set('frontpage', $fp_list);
 	$corePrefs->set('frontpage_force', $fp_force);
 	$result = $corePrefs->save(FALSE, TRUE);
-	$mes->addDebug("<h4>".FRTLAN_58."</h4>".print_a($fp_list, true));
-	$mes->addDebug("<h4>".FRTLAN_59."</h4>".print_a($fp_force, true));
+	$mes->addDebug("<h4>Home</h4>".print_a($fp_list, true));
+	$mes->addDebug("<h4>Post-Login</h4>".print_a($fp_force, true));
 }
 
 
diff --git a/e107_admin/language.php b/e107_admin/language.php
index f1ac985ba..6a85f72c3 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -1447,7 +1447,7 @@ function zip_up_lang($language)
 		$ret['error'] = TRUE;
 		$file = "e107_languages/{$language}/{$language}.php";
 		$def = (defined('LANG_LAN_25')) ? LANG_LAN_25 : LANG_LAN_119;
-		$ret['message'] = str_replace("[lcpath]",$file,$def); // 
+		$ret['message'] = str_replace("[x]",$file,$def); //
 		return $ret;	
 	}
 		
@@ -1630,7 +1630,7 @@ function unused($lanfile,$script,$reverse=false)
 
 		}	
 		
-		$mes->addDebug(LANG_LAN_122." ".$script);
+		$mes->addDebug("Script: ".$script);
 
 		$tmp = explode(",", $lanfile);
 		foreach($tmp as $scr)
@@ -1642,7 +1642,7 @@ function unused($lanfile,$script,$reverse=false)
 			}
 			
 			$compare[$scr] = file_get_contents($scr);	
-			$mes->addDebug(LANG_LAN_123." ".$scr);
+			$mes->addDebug("LanFile: ".$scr);
 		
 		}	
 		
@@ -1651,7 +1651,7 @@ function unused($lanfile,$script,$reverse=false)
 	else
 	{
 		$lanDefines = file_get_contents($lanfile);
-		$mes->addDebug(LANG_LAN_123." ".$lanfile);
+		$mes->addDebug("LanFile: ".$lanfile);
 		
 		$tmp = explode(",",$script);
 		foreach($tmp as $scr)
@@ -1662,7 +1662,7 @@ function unused($lanfile,$script,$reverse=false)
 				continue;	
 			}
 			$compare[$scr] = file_get_contents($scr);	
-			$mes->addDebug(LANG_LAN_122." ".$scr);
+			$mes->addDebug("Script: ".$scr);
 		}		
 	}
 		
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 257588a3b..d621ca765 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -683,11 +683,11 @@ class news_admin_ui extends e_admin_ui
 
 		$mes = e107::getMessage();
 
-		$mes->addDebug(LAN_NEWS_76,'default',true);
+		$mes->addDebug('Checking for Ping Status','default',true);
 
 		if(!empty($_POST['news_ping']) && (count($pingServices)>0) && (in_array(e_UC_PUBLIC, $_POST['news_class'])))
 		{
-			$mes->addDebug(LAN_NEWS_77,'default',true);
+			$mes->addDebug("Initiating ping",'default',true);
 
 			include (e_HANDLER.'xmlrpc/xmlrpc.inc.php');
 			include (e_HANDLER.'xmlrpc/xmlrpcs.inc.php');
@@ -712,11 +712,11 @@ class news_admin_ui extends e_admin_ui
 
 				if($this->ping($server, $port, $path, $weblog_name, $weblog_url, $changes_url, $cat_or_rss, $extended))
 				{
-					e107::getMessage()->addInfo(LAN_NEWS_78." ".$server .' '.LAN_NEWS_79.'<br />url: '.$changes_url .'<br />rss: '.$cat_or_rss , 'default', true);
+					e107::getMessage()->addInfo("Successfully Pinged: ".$server .' with:<br />url: '.$changes_url .'<br />rss: '.$cat_or_rss , 'default', true);
 				}
 				else
 				{
-					e107::getMessage()->addDebug(LAN_NEWS_80." ".$server .' '.LAN_NEWS_79.' '.$changes_url , 'default', true);
+					e107::getMessage()->addDebug("Ping failed!: ".$server .' with: '.$changes_url , 'default', true);
 				}
 
 			}
@@ -724,9 +724,9 @@ class news_admin_ui extends e_admin_ui
 		}
 		else
 		{
-		//	$mes->addDebug(LAN_NEWS_81,'default',true);
-		//	$mes->addDebug(LAN_NEWS_82." ".print_a($pingServices, true),'default', true);
-		//	$mes->addDebug(LAN_NEWS_83." ".print_a($_POST['news_class'],true),'default', true);
+		//	$mes->addDebug('Ping not triggerred','default',true);
+		//	$mes->addDebug("Services: ".print_a($pingServices, true),'default', true);
+		//	$mes->addDebug("Userclass: ".print_a($_POST['news_class'],true),'default', true);
 
 		}
 
@@ -739,7 +739,7 @@ class news_admin_ui extends e_admin_ui
 		$mes = e107::getMessage();
 		$log = e107::getAdminLog();
 		
-		$mes->addDebug(LAN_NEWS_84." ".$xml_rpc_server, 'default', true);
+		$mes->addDebug("Attempting to ping: ".$xml_rpc_server, 'default', true);
 
 		
         $name_param 		= new xmlrpcval($weblog_name, 'string');
@@ -772,12 +772,12 @@ class news_admin_ui extends e_admin_ui
         $client 	= new xmlrpc_client($xml_rpc_path, $xml_rpc_server, $xml_rpc_port);
         $response 	= $client->send($message);
        
-        $this->log_ping(LAN_NEWS_85." " . $call_text);
+        $this->log_ping("Request: " . $call_text);
         $this->log_ping($message->serialize(), true);
 		
         if ($response == 0) 
         {
-            $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $client->errno . " " . $client->errstring;
+            $error_text = "Error: " . $xml_rpc_server . ": " . $client->errno . " " . $client->errstring;
             $this->report_error($error_text);
             $this->log_ping($error_text);
 			$log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$client->errstring))->save('PING_01');
@@ -787,7 +787,7 @@ class news_admin_ui extends e_admin_ui
 		
         if ($response->faultCode() != 0)  
         {
-            $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $response->faultCode() . " " . $response->faultString();
+            $error_text = "Error: " . $xml_rpc_server . ": " . $response->faultCode() . " " . $response->faultString();
             $this->report_error($error_text);
 			$log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$response->faultString()))->save('PING_01');
 	
@@ -808,7 +808,7 @@ class news_admin_ui extends e_admin_ui
         // read the response
         if ($fl_error->scalarval() != false) 
         {
-            $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $message->scalarval();
+            $error_text = "Error: " . $xml_rpc_server . ": " . $message->scalarval();
 			$this->report_error($error_text);
 			$log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$message->scalarval()))->save('PING_01');
 	
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 84a228c51..a10a984d5 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -179,7 +179,7 @@ $frm = e107::getForm();
 
 function e_help()
 {
-	$help_text = str_replace('[interval]', (PLUGIN_SCAN_INTERVAL ? PLUGIN_SCAN_INTERVAL / 60 : 0), EPL_ADLAN_228);
+	$help_text = str_replace('[x]', (PLUGIN_SCAN_INTERVAL ? PLUGIN_SCAN_INTERVAL / 60 : 0), EPL_ADLAN_228);
 	return array(
 		'caption'	=> EPL_ADLAN_227,
 		'text'		=> $help_text."<p><a class='btn btn-mini btn-primary' href='".e_SELF."?refresh'>".EPL_ADLAN_229."</a></p>"
@@ -1195,7 +1195,7 @@ class pluginManager{
 		else
 		{
 			$text .= "<tr><td class='center' colspan='".count($this->fields)."'>";
- 			$text .= str_replace("[link]", "<a href='".e_ADMIN."plugin.php?avail'>".EPL_ADLAN_100."</a>", EPL_ADLAN_101);
+ 			$text .= str_replace("[x]", "<a href='".e_ADMIN."plugin.php?avail'>".EPL_ADLAN_100."</a>", EPL_ADLAN_101);
 			$text .= "</td></tr>";
 		}
 
@@ -2221,7 +2221,7 @@ class pluginBuilder
 
 			$info = EPL_ADLAN_102;
 			$info .= "<ul>";
-			$info .= "<li>".str_replace('[e_PLUGIN]', e_PLUGIN, EPL_ADLAN_103)."</li>";
+			$info .= "<li>".str_replace('[x]', e_PLUGIN, EPL_ADLAN_103)."</li>";
 			$info .= "<li>".EPL_ADLAN_104."</li>";
 			$info .= "<li>".EPL_ADLAN_105."</li>";
 			$info .= "<li>".EPL_ADLAN_106."</li>";
@@ -2464,7 +2464,7 @@ class pluginBuilder
 					
 					if(file_put_contents(e_PLUGIN.$this->pluginName."/".$this->pluginName."_sql.php",$cont))
 					{
-						$info = str_replace('[file]', $this->pluginName."_sql.php", EPL_ADLAN_132);
+						$info = str_replace('[x]', $this->pluginName."_sql.php", EPL_ADLAN_132);
 						$mes->addInfo($info,'default',true);
 						$red = e107::getRedirect();
 						$red->redirect(e_REQUEST_URL,true);
@@ -2472,8 +2472,8 @@ class pluginBuilder
 					}
 					else 
 					{
-						$msg = str_replace('[file]', $this->pluginName."_sql.php", EPL_ADLAN_133)."<br />";
-						$msg .= str_replace(array('[file]','[content]'), array($this->pluginName."_sql.php",$cont), EPL_ADLAN_134);
+						$msg = str_replace('[x]', $this->pluginName."_sql.php", EPL_ADLAN_133)."<br />";
+						$msg .= str_replace(array('[x]','[y]'), array($this->pluginName."_sql.php",$cont), EPL_ADLAN_134);
 						$mes->addWarning($msg);	
 					}
 					
@@ -3607,12 +3607,12 @@ exit;
 			{
 				if(file_put_contents($generatedFile, $startPHP .$text . $endPHP))
 				{
-					$message = str_replace("[link]", "<a href='".$generatedFile."'>".EPL_ADLAN_216."</a>", EPL_ADLAN_217);
+					$message = str_replace("[x]", "<a href='".$generatedFile."'>".EPL_ADLAN_216."</a>", EPL_ADLAN_217);
 					$mes->addSuccess($message);
 				}	
 				else 
 				{
-					$mes->addError(str_replace('[file]', $generatedFile, EPL_ADLAN_218));
+					$mes->addError(str_replace('[x]', $generatedFile, EPL_ADLAN_218));
 				}
 			}
 			else
diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index f5f5696de..77c897010 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -76,18 +76,18 @@ class upload_ui extends e_admin_ui
             'upload_id'             =>   array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
             'upload_datestamp'      =>   array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
            'upload_name'           =>   array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', 'validate' => true, 'inline' => true),
-            'upload_poster'         =>   array ( 'title' => 'Poster', 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
-            'upload_email'          =>   array ( 'title' => 'Email', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+            'upload_poster'         =>   array ( 'title' => UPLLAN_5, 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+            'upload_email'          =>   array ( 'title' => LAN_EMAIL, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
             'upload_website'        =>   array ( 'title' => LAN_URL, 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
-            'upload_version'        =>   array ( 'title' => 'Version', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
-            'upload_file'           =>   array ( 'title' => 'File', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', 'validate' => true ),
+            'upload_version'        =>   array ( 'title' => UPLLAN_9, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+            'upload_file'           =>   array ( 'title' => LAN_FILE, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', 'validate' => true ),
             'upload_ss'             =>   array ( 'title' => 'Ss', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
             'upload_description'    =>   array ( 'title' => LAN_DESCRIPTION, 'type' => 'textarea', 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
-            'upload_demo'           =>   array ( 'title' => 'Demo', 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
-            'upload_filesize'       =>   array ( 'title' => 'Filesize', 'type' => 'hidden', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
-            'upload_active'         =>   array ( 'title' => 'Status', 'type' => 'method', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('singleOption' => true), 'class' => 'center', 'thclass' => 'center',  'batch' => true),
+            'upload_demo'           =>   array ( 'title' => UPLLAN_14, 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+            'upload_filesize'       =>   array ( 'title' => UPLLAN_11, 'type' => 'hidden', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+            'upload_active'         =>   array ( 'title' => LAN_STATUS, 'type' => 'method', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('singleOption' => true), 'class' => 'center', 'thclass' => 'center',  'batch' => true),
             'upload_category'       =>   array ( 'title' => LAN_CATEGORY, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', 'validate' => true ),
-            'options'               =>   array ( 'title' => 'Options', 'type' => '', 'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1',  ),
+            'options'               =>   array ( 'title' => LAN_OPTIONS, 'type' => '', 'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1',  ),
 		);		
 		
 		protected $fieldpref = array('checkboxes', 'upload_datestamp', 'upload_name', 'upload_category', 'options');
@@ -181,7 +181,7 @@ class upload_ui extends e_admin_ui
 
         if($new_data['upload_active'] && !e107::isInstalled('download'))
         {
-            $this->getModel()->addValidationError('Download plugin is not installed - activation not possible.'); // TODO lan
+            $this->getModel()->addValidationError(UPLLAN_62);
 			$new_data['upload_active'] = 0;
             return $new_data;
         }
@@ -201,11 +201,16 @@ class upload_ui extends e_admin_ui
             if(!$sql->delete('upload', 'upload_id='.$id))
             {
                 e107::getMessage()
-                    ->addError('SQL Error: #'.$sql->getLastErrorNumber().' '.$sql->getLastErrorText(), 'default', $isSession) // TODO lan
+                    ->addError(UPLLAN_68.' #'.$sql->getLastErrorNumber().' '.$sql->getLastErrorText(), 'default', $isSession)
                     ->addDebug($sql->getLastQuery(), 'default', $isSession);
             }
-            // TODO lan
-            else e107::getMessage()->addSuccess('Record moved to Downloads. <br><a href="'.e_PLUGIN_ABS.'download/admin_download.php?mode=main&action=edit&id='.$did.'">Manage Download</a>', 'default', $isSession);
+            else
+            {
+                $link = '<br><a href="'.e_PLUGIN_ABS.'download/admin_download.php?mode=main&action=edit&id='.$did.'">'.UPLLAN_64.'</a>';
+                $message = str_replace('[x]', $link, UPLLAN_63);
+                e107::getMessage()->addSuccess($message, 'default', $isSession);
+            }
+
         }
     }
 
@@ -235,23 +240,23 @@ class upload_ui extends e_admin_ui
         $uploadPath = e_UPLOAD;
         if(!file_exists($uploadPath.$upload['upload_file']))
         {
-            $this->getModel()->addValidationError('File not found'); // TODO lan
+            $this->getModel()->addValidationError(UPLLAN_65);
             return false;
         }
         $downloadPath = $media->importFile($upload['upload_file'], 'download_file', $uploadPath.$upload['upload_file'], array('media_caption' => $upload['upload_name']));
         if(false === $downloadPath)
         {
-            $this->getModel()->addValidationError('Download path error'); // TODO lan
+            $this->getModel()->addValidationError(UPLLAN_66);
             return false;
         }
 
         $imagePath = null;
         if($upload['upload_ss'] && file_exists($uploadPath.$upload['upload_ss']))
         {
-            $imagePath = $media->importFile($upload['upload_ss'], '_common_image', $uploadPath.$upload['upload_ss'], array('media_caption' => $upload['upload_name'].' Preview')); // TODO lan
+            $imagePath = $media->importFile($upload['upload_ss'], '_common_image', $uploadPath.$upload['upload_ss'], array('media_caption' => $upload['upload_name'].' '.LAN_PREVIEW));
         }
 
-        $author = $upload['upload_poster'] ? e107::getSystemUser($upload['upload_poster'])->getRealName() : 'Anonymous'; // TODO lan
+        $author = $upload['upload_poster'] ? e107::getSystemUser($upload['upload_poster'])->getRealName() : UPLLAN_67;
 
         $dl = array(
             'download_name' => $upload['upload_name'],
@@ -280,7 +285,7 @@ class upload_ui extends e_admin_ui
         $id = $sql->insert('download', $dl);
         if(!$id)
         {
-            $this->getModel()->addValidationError('SQL Error: #'.$sql->getLastErrorNumber().' '.$sql->getLastErrorText());  // TODO lan
+            $this->getModel()->addValidationError(UPLLAN_68.' #'.$sql->getLastErrorNumber().' '.$sql->getLastErrorText());
             e107::getMessage()->addDebug($sql->getLastQuery());
             return;
         }
@@ -299,7 +304,7 @@ class upload_form_ui extends e_admin_form_ui
         switch($type)
         {
             case 'write':
-                return $this->radio_switch('upload_active', $value, 'Accept', 'Pending', $options);
+                return $this->radio_switch('upload_active', $value, LAN_ACCEPT, LAN_PENDING, $options);
             break;
 
             case 'read':
@@ -318,7 +323,7 @@ class upload_form_ui extends e_admin_form_ui
 				}
 				*/
 				
-				$text =  $this->option('Accept', 'upload_active', false, array('other' => 'style="padding-left: 15px"'));
+				$text =  $this->option(LAN_ACCEPT, 'upload_active', false, array('other' => 'style="padding-left: 15px"'));
 	
 				
                 return $text; // $this->option('Accept', 'upload_active', false, array('other' => 'style="padding-left: 15px"'));
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 16adb6960..cf2e4462f 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -99,8 +99,10 @@ class users_admin extends e_admin_dispatcher
 						$id = $_POST['userid'];
 						$_POST['etrigger_delete'] = array($id => $id);
 						$user = e107::getDb()->retrieve('user', 'user_email, user_name', 'user_id='.$id);
-						// TODO lan
-						$this->getController()->deleteConfirmMessage = "You are about to delete {$user['user_name']} ({$user['user_email']}) with ID #{$id}. Are you sure?";//
+						$rplc_from = array('[x]', '[y]', '[z]');
+						$rplc_to = array($user['user_name'], $user['user_email'], $id);
+						$message = str_replace($rplc_from, $rplc_to, USRLAN_222);
+						$this->getController()->deleteConfirmMessage = $message;
 					}
 				break;
 				
@@ -470,8 +472,7 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			e107::getMessage()->addError('User not found.');
+			e107::getMessage()->addError(USRLAN_223);
 			return;
 		}
 
@@ -502,8 +503,7 @@ class users_admin_ui extends e_admin_ui
 		$sysuser = e107::getSystemUser($userid, false);
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError('User not found.');
+			$mes->addError(USRLAN_223);
 			return;
 		}
 		$row = $sysuser->getData();
@@ -594,19 +594,17 @@ class users_admin_ui extends e_admin_ui
 				);
 				if($sysuser->email('email', $options))
 				{
-					// TODO lan
-					$mes->addSuccess("Email sent to: ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
+					$mes->addSuccess(USRLAN_224." ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
 				}
 				else 
 				{
-					$mes->addError("Failed to send email to: ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
+					$mes->addError(USRLAN_225." ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
 				}
 			}
 		}
 		else
 		{
-			// TODO lan
-			$mes->addError('User not found.');
+			$mes->addError(USRLAN_223);
 			return;
 		}
 	}
@@ -693,15 +691,12 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$user->checkAdminPerms('3'))
 		{
-			// TODO lan
-			$mes->addError("You don't have enough permissions to do this.", 'default', true);
+			$mes->addError(USRLAN_226, 'default', true);
 			
-			// TODO lan
-			$lan = 'Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to remove admin status from --UID-- (--NAME--, --EMAIL--)';
 			$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
 			$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
 			
-			e107::getAdminLog()->log_event('USET_08', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
+			e107::getAdminLog()->log_event('USET_08', str_replace($search, $replace, USRLAN_244), E_LOG_INFORMATIVE);
 			$this->redirect('list', 'main', true);
 		}
 
@@ -719,8 +714,7 @@ class users_admin_ui extends e_admin_ui
 			}
 			else
 			{
-				// TODO lan
-				$mes->addError('Unknown error. Action failed.');
+				$mes->addError(USRLAN_227);
 			}
 		}
 	}
@@ -745,22 +739,18 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$user->checkAdminPerms('3'))
 		{
-			// TODO lan
-			$mes->addError("You don't have enough permissions to do this.", 'default', true);
-			// TODO lan
-			$lan = 'Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to make --UID-- (--NAME--, --EMAIL--) system admin';
+			$mes->addError(USRLAN_226, 'default', true);
 			$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
 			$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
 			
-			e107::getLog()->add('USET_08', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_08', str_replace($search, $replace, USRLAN_245), E_LOG_INFORMATIVE);
 			
 			$this->redirect('list', 'main', true);
 		}
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError("User not found.", 'default', true);
+			$mes->addError(USRLAN_223, 'default', true);
 			$this->redirect('list', 'main', true);
 		}
 		
@@ -777,8 +767,11 @@ class users_admin_ui extends e_admin_ui
 		//	$lan = str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_164);
 		//	e107::getLog()->add('USET_08', $lan, E_LOG_INFORMATIVE);
 		//	$mes->addSuccess($lan);
-			$mes->addWarning("You are about to make User #<b>".$sysuser->getId()."</b> : <b>".$sysuser->getName()."</b> (".$sysuser->getValue('email').") an <b>administrator</b>."); ///TODO LAN
-			$mes->addWarning("Set the permissions and click <b>Update</b> to proceed or <b>Back</b> to abort.");
+			$rplc_from = array('[x]', '[y]', '[z]');
+			$rplc_to = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'));
+			$message = str_replace($rplc_from, $rplc_to, USRLAN_228);
+			$mes->addWarning($message);
+			$mes->addWarning(USRLAN_229);
 		}
 		
 	}
@@ -801,8 +794,7 @@ class users_admin_ui extends e_admin_ui
 			->appendBody($prm->renderSubmitButtons())
 			->appendBody($frm->close());
 		
-		// TODO lan
-		$this->addTitle(str_replace(array('{NAME}', '{EMAIL}'), array($sysuser->getName(), $sysuser->getValue('email')), 'Update administrator {NAME} ({EMAIL})'));
+		$this->addTitle(str_replace(array('[x]', '[y]'), array($sysuser->getName(), $sysuser->getValue('email')), USRLAN_230));
 	}
 	
 	protected function checkAllowed($class_id) // check userclass change is permitted.
@@ -834,8 +826,7 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError('User not found.');
+			$mes->addError(USRLAN_223);
 			return false;
 		}
 
@@ -850,8 +841,7 @@ class users_admin_ui extends e_admin_ui
 			$a = intval($a);
 			if(!$this->checkAllowed($a)) 
 			{
-				// TODO lan
-				$mes->addError('Insufficient permissions, operation aborted.');
+				$mes->addError(USRLAN_231);
 				return false;
 			}
 			
@@ -1005,15 +995,13 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError('User not found.');
+			$mes->addError(USRLAN_223);
 			return false;
 		}
 
 		if(!$key || !$sysuser->getValue('ban'))
 		{
-			// TODO lan
-			$mes->addError('Missing activation key.');
+			$mes->addError(USRLAN_232);
 			return false;
 		}
 		
@@ -1076,22 +1064,19 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError('User not found.', 'default', true);
+			$mes->addError(USRLAN_223, 'default', true);
 			$this->redirect('list', 'main', true);
 		}
 		
 		$result = $this->testEmail($email);
 		if($result)
 		{
-			// TODO lan
 			$this->setParam('testSucces', $result);
-			$mes->addSuccess($email.' - Valid');
+			$mes->addSuccess($email.' - '.USRLAN_233);
 		}
 		else
 		{
-			// TODO lan
-			$mes->addError($email.' - Invalid', 'default', true);
+			$mes->addError($email.' - '.USRLAN_234, 'default', true);
 			$this->redirect('list', 'main', true);
 		}
 
@@ -1113,8 +1098,7 @@ class users_admin_ui extends e_admin_ui
 		$email = $sysuser->getValue('email');
 		$frm = e107::getForm();
 		
-		// TODO lan
-		$caption = "Test ".$email;
+		$caption = str_replace('[x]', $email, USRLAN_119);
 		$this->addTitle($caption);
 		
 		$text = "<a href='".e_REQUEST_HTTP."?mode=main&amp;action=list'>".LAN_BACK."</a>";
@@ -1171,8 +1155,7 @@ class users_admin_ui extends e_admin_ui
 		
 		if(!$sysuser->getId())
 		{
-			// TODO lan
-			$mes->addError('User not found.', 'default', true);
+			e107::getMessage()->addError(USRLAN_223, 'default', true);
 			return;
 		}
 		
@@ -1181,8 +1164,7 @@ class users_admin_ui extends e_admin_ui
 		
 		if($sysuser->save())
 		{
-			// TODO lan
-			e107::getMessage()->addSuccess('User now has to verify.');
+			e107::getMessage()->addSuccess(USRLAN_235);
 			
 			// TODO - auto-send email or not - discuss
 			$this->resendActivation($userid);
@@ -1194,8 +1176,7 @@ class users_admin_ui extends e_admin_ui
 			return;
 		}
 		
-		// TODO lan
-		e107::getMessage()->addError('Action failed.');
+		e107::getMessage()->addError(USRLAN_236);
 	}
 
 	/**
@@ -1235,8 +1216,7 @@ class users_admin_ui extends e_admin_ui
 			if ($allData['data']['user_name'] != $allData['data']['user_loginname'])
 			{
 				$allData['data']['user_name'] = $allData['data']['user_loginname'];
-				// TODO lan
-				$mes->addWarning(str_replace('--NAME--', $allData['data']['user_loginname'], 'User name and display name cannot be different (based on the site configuration). Display name set to <strong>--NAME--</strong>.'));
+				$mes->addWarning(str_replace('[x]', $allData['data']['user_loginname'], USRLAN_237));
 				//$allData['errors']['user_name'] = ERR_FIELDS_DIFFERENT;
 			}
 		}
@@ -1340,8 +1320,7 @@ class users_admin_ui extends e_admin_ui
 						$check = $sysuser->email('quickadd', array(
 							'user_password' => $savePassword, 
 							'mail_subject' => USRLAN_187.SITENAME,
-							// TODO lan
-							'activation_url' => 'Your current status is <strong>Active</strong>',
+							'activation_url' => USRLAN_238,
 						));
 					break;
 					
@@ -1452,13 +1431,12 @@ class users_admin_ui extends e_admin_ui
 			</tr>
 	
 			<tr>
-				<td>Notification and user status</td>
+				<td>".USRLAN_239."</td>
 				<td>
-					".$frm->select('sendconfemail', array('0' => "Activate, Don't Notify", '1' => 'Activate, Notify (password)', '2' => 'Require Activation, Notify (password and activation link)'), (int) varset($_POST['sendconfemail'], 0))."
+					".$frm->select('sendconfemail', array('0' => USRLAN_240, '1' => USRLAN_241, '2' => USRLAN_242), (int) varset($_POST['sendconfemail'], 0))."
 					<div class='field-help'>".USRLAN_181."</div>
 				</td>
 			</tr>";
-			// TODO lan above
 
 		if (!isset ($user_data['user_class'])) $user_data['user_class'] = varset($pref['initial_user_classes']);
 		$temp = $e_userclass->vetted_tree('class', array($e_userclass, 'checkbox_desc'), $user_data['user_class'], 'classes, no-excludes');
@@ -1483,7 +1461,7 @@ class users_admin_ui extends e_admin_ui
 		<tr>
 			<td>".USRLAN_35."</td>
 			<td>
-				<a href='#set_perms' class='btn e-expandit'>Set Permissions</a>
+				<a href='#set_perms' class='btn e-expandit'>".USRLAN_243."</a>
 				<div class='e-hideme' id='set_perms'>
 		";
 			
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 2a5f7e201..5c6f943fd 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -270,6 +270,8 @@ define("LAN_DATESTAMP","Date stamp");
 define("LAN_OPTIONAL", "optional");
 define("LAN_INACTIVE","Inactive");
 define("LAN_ACTIVE","Active");
+define("LAN_ACCEPT","Accept");
+define("LAN_PENDING","Pending");
 
 define("LAN_BAN","Ban");
 define("LAN_RATING", "Rating");
diff --git a/e107_languages/English/admin/lan_cron.php b/e107_languages/English/admin/lan_cron.php
index 95c84fd57..c6da67b0f 100644
--- a/e107_languages/English/admin/lan_cron.php
+++ b/e107_languages/English/admin/lan_cron.php
@@ -88,9 +88,6 @@ define("LAN_CRON_52", "Day(s):");
 define("LAN_CRON_53", "Month(s):");   
 define("LAN_CRON_54", "Weekday(s):");
 
-define("LAN_CRON_55", "Executing config function [b][function][/b]");
-define("LAN_CRON_56", "Config function [b][method][/b] NOT found.");
-
 define("LAN_CRON_BACKUP", "Backup");
 define("LAN_CRON_LOGGING", "Logging");
 define("LAN_CRON_RUNNING", "Running")
diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php
index 816f425fb..f8d6af6a9 100644
--- a/e107_languages/English/admin/lan_frontpage.php
+++ b/e107_languages/English/admin/lan_frontpage.php
@@ -43,8 +43,6 @@ define("FRTLAN_PAGE_TITLE", "Front Page");
 //define("FRTLAN_55", "Confirm delete rule?");
 define("FRTLAN_56", "duplicate definition for class:");
 define("FRTLAN_57", "Software error");
-define("FRTLAN_58", "Home");
-define("FRTLAN_59", "Post-Login");
 define("FRTLAN_60", "Front");
 
 ?>
\ No newline at end of file
diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php
index 271be3e8f..c5924b892 100644
--- a/e107_languages/English/admin/lan_language.php
+++ b/e107_languages/English/admin/lan_language.php
@@ -78,11 +78,9 @@ define("LANG_LAN_115", "Please verify and correct the remaining [x] error(s) bef
 define("LANG_LAN_116", "Please verify your language files ('Verify') then try again.");
 define("LANG_LAN_117", "You should correct the remaining errors before contributing your language pack.");
 define("LANG_LAN_118", "Please verify your language files ('Verify') then try again.");
-define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [lcpath] and try again.");
+define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [x] and try again.");
 define("LANG_LAN_120", "Please make sure you are using default folder names in e107_config.php (eg. e107_languages/, e107_plugins/ etc.) and try again.");
 define("LANG_LAN_121", "Couldn't Load:");
-define("LANG_LAN_122", "Script:");
-define("LANG_LAN_123", "LanFile:");
 define("LANG_LAN_124", "Definition");
 define("LANG_LAN_125", "(disabled)");
 define("LANG_LAN_126", "Disable All Unused");
diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php
index 8870bf5c2..899e60844 100644
--- a/e107_languages/English/admin/lan_newspost.php
+++ b/e107_languages/English/admin/lan_newspost.php
@@ -210,17 +210,6 @@ define("LAN_NEWS_73", "Sidebar - Othernews 2");
 define("LAN_NEWS_74", "Carousel");
 define("LAN_NEWS_75", "Featurebox");
 
-define("LAN_NEWS_76", "Checking for Ping Status");
-define("LAN_NEWS_77", "Initiating ping");
-define("LAN_NEWS_78", "Successfully Pinged:");
-define("LAN_NEWS_79", "with:");
-define("LAN_NEWS_80", "Ping failed!:");
-define("LAN_NEWS_81", "Ping not triggerred");
-define("LAN_NEWS_82", "Services:");
-define("LAN_NEWS_83", "Userclass:");
-define("LAN_NEWS_84", "Attempting to ping:");
-define("LAN_NEWS_85", "Request:");
-define("LAN_NEWS_86", "Error:");
 define("LAN_NEWS_87", "eg. blogsearch.google.com/ping/RPC2");
 define("LAN_NEWS_88", "Determines how the default news page should appear.");
 define("LAN_NEWS_89", "Notify these services when you create/update news items.");
diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php
index dbf713fd4..7bbb936fc 100644
--- a/e107_languages/English/admin/lan_plugin.php
+++ b/e107_languages/English/admin/lan_plugin.php
@@ -116,9 +116,9 @@ define ('EPL_ADLAN_97',"There was a problem extracting the .zip file to your plu
 define ('EPL_ADLAN_98',"Unknown file:");
 define ('EPL_ADLAN_99',"Error messages above this line");
 define ('EPL_ADLAN_100',"click here to install some");
-define ('EPL_ADLAN_101',"No plugins installed - [link].");
+define ('EPL_ADLAN_101',"No plugins installed - [x].");
 define ('EPL_ADLAN_102',"This Wizard will build an admin area for your plugin and generate a plugin.xml meta file. Before you start:");
-define ('EPL_ADLAN_103',"Create a new writable folder in the [e_PLUGIN] directory eg. [b]myplugin[/b]");
+define ('EPL_ADLAN_103',"Create a new writable folder in the [x] directory eg. [b]myplugin[/b]");
 define ('EPL_ADLAN_104',"If your plugin will use sql tables, create a new file in this folder and name it the same as the directory but with [b]_sql.php[/b] as a sufix eg. [b]myplugin_sql.php[/b]");
 define ('EPL_ADLAN_105',"Create your table in phpMyAdmin and paste an sql dump of it into your file and save. (see [i]e107_plugins/_blank/_blank_sql.php[/i] for an example)");
 define ('EPL_ADLAN_106',"Select your plugin's folder to begin.");
@@ -149,9 +149,9 @@ define ('EPL_ADLAN_128',"File");
 define ('EPL_ADLAN_129',"Preference Name");
 define ('EPL_ADLAN_130',"Default Value");
 define ('EPL_ADLAN_131',"Field Type...");
-define ('EPL_ADLAN_132',"[file] has been generated");
-define ('EPL_ADLAN_133',"[file] is missing!");
-define ('EPL_ADLAN_134',"Please create [b][file][/b] in your plugin directory with the following content: [content]");
+define ('EPL_ADLAN_132',"[x] has been generated");
+define ('EPL_ADLAN_133',"[x] is missing!");
+define ('EPL_ADLAN_134',"Please create [b][x][/b] in your plugin directory with the following content: [y]");
 define ('EPL_ADLAN_135',"The name of your plugin. (Must be written in English)");
 define ('EPL_ADLAN_136',"If you have a language file, enter the LAN_XXX value for the plugin's name");
 define ('EPL_ADLAN_137',"Creation date of your plugin");
@@ -250,8 +250,8 @@ define ('EPL_ADLAN_214',"Images (array)");
 define ('EPL_ADLAN_215',"Hidden");
 
 define ('EPL_ADLAN_216',"Click Here");
-define ('EPL_ADLAN_217',"[link] to vist your generated admin area");
-define ('EPL_ADLAN_218',"Could not write to [file]");
+define ('EPL_ADLAN_217',"[x] to vist your generated admin area");
+define ('EPL_ADLAN_218',"Could not write to [x]");
 define ('EPL_ADLAN_219',"No Files have been created. Please Copy &amp; Paste the code below into your files.");
 
 define ('EPL_ADLAN_220',"Find Plugins");
@@ -265,7 +265,7 @@ define ('EPL_ADLAN_225',"Unsure");
 define ('EPL_ADLAN_226',"Plugin Language-File Check");
 
 define ('EPL_ADLAN_227',"Scan for Changes");
-define ('EPL_ADLAN_228',"Plugin folders are scanned every [interval] minutes for changes. Click the button below to scan now.");
+define ('EPL_ADLAN_228',"Plugin folders are scanned every [x] minutes for changes. Click the button below to scan now.");
 define ('EPL_ADLAN_229',"Refresh");
 
 define('LAN_UPGRADE_SUCCESSFUL', "Upgrade Successful");
diff --git a/e107_languages/English/admin/lan_upload.php b/e107_languages/English/admin/lan_upload.php
index 7d4af82d8..3c2d668ac 100644
--- a/e107_languages/English/admin/lan_upload.php
+++ b/e107_languages/English/admin/lan_upload.php
@@ -92,13 +92,14 @@ define('UPLLAN_58', 'Default');
 define('UPLLAN_59', 'Settings written to ');
 define('UPLLAN_60', 'Now move this file to ');
 define('UPLLAN_61', 'Error writing file: ');
-define('UPLLAN_62', '');
-define('UPLLAN_63', '');
-define('UPLLAN_64', '');
-define('UPLLAN_65', '');
-define('UPLLAN_66', '');
-define('UPLLAN_67', '');
-define('UPLLAN_68', '');
+
+define('UPLLAN_62', 'Download plugin is not installed - activation not possible.');
+define('UPLLAN_63', 'Record moved to Downloads. [x]');
+define('UPLLAN_64', 'Manage Download');
+define('UPLLAN_65', 'File not found');
+define('UPLLAN_66', 'Download path error');
+define('UPLLAN_67', 'Anonymous');
+define('UPLLAN_68', 'SQL Error:');
 define('UPLLAN_69', '');
 define('UPLLAN_70', '');
 
diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php
index b934598e4..79971736b 100644
--- a/e107_languages/English/admin/lan_users.php
+++ b/e107_languages/English/admin/lan_users.php
@@ -114,6 +114,7 @@ define("USRLAN_115", "Thanks for your registration.");
 define("USRLAN_116", "Please confirm that you wish to resend a confirmation email to:");
 define("USRLAN_117", "Click the button below to test the following email:");
 define("USRLAN_118", "Test Email");
+define("USRLAN_119", "Test [x]");
 
 define("USRLAN_120", "Set Classes");
 define("USRLAN_121", "Mailing");
@@ -236,6 +237,38 @@ define('LAN_BOUNCED','Bounced');
 define('USRLAN_220', 'All Userclasses');
 define('USRLAN_221', 'Edit admin perms');
 
+define('USRLAN_222', 'You are about to delete [x] ([y]) with ID #[z]. Are you sure?');
+define('USRLAN_223', 'User not found.');
+define('USRLAN_224', 'Email sent to:');
+define('USRLAN_225', 'Failed to send email to:');
+define('USRLAN_226', "You don't have enough permissions to do this.");
+define('USRLAN_227', 'Unknown error. Action failed.');
+define('USRLAN_228', 'You are about to make User #[b][x][/b] : [b][y][/b] ([z]) an [b]administrator[/b].');
+define('USRLAN_229', 'Set the permissions and click [b]Update[/b] to proceed or [b]Back[/b] to abort.');
+define('USRLAN_230', 'Update administrator [x] ([y])');
+define('USRLAN_231', 'Insufficient permissions, operation aborted.');
+define('USRLAN_232', 'Missing activation key.');
+define('USRLAN_233', 'Valid');
+define('USRLAN_234', 'Invalid');
+define('USRLAN_235', 'User now has to verify.');
+define('USRLAN_236', 'Action failed.');
+define('USRLAN_237', 'User name and display name cannot be different (based on the site configuration). Display name set to [b][x][/b].');
+define('USRLAN_238', 'Your current status is [b]Active[/b]');
+
+define('USRLAN_239', 'Notification and user status');
+define('USRLAN_240', "Activate, Don't Notify");
+define('USRLAN_241', 'Activate, Notify (password)');
+define('USRLAN_242', 'Require Activation, Notify (password and activation link)');
+
+define('USRLAN_243', 'Set Permissions');
+define('USRLAN_244', 'Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to remove admin status from --UID-- (--NAME--, --EMAIL--)');
+define('USRLAN_245', 'Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to make --UID-- (--NAME--, --EMAIL--) system admin');
+define('USRLAN_246', 'Us');
+define('USRLAN_247', 'Us');
+define('USRLAN_248', 'Us');
+define('USRLAN_249', 'Us');
+define('USRLAN_250', 'Us');
+
 // These need review - there are duplicates above - they come from admin/lan_userclass.php.
 define("UCSLAN_1", "Sending notification email to");
 define("UCSLAN_2", "Updated Privileges");
diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index fa66bedeb..8dd844820 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -189,4 +189,4 @@ define("LANINS_129", "Database not found.");
 define('LANINS_130', "Parked Domain");
 define('LANINS_131', "The parked domain which will become a new e107 website.");
 define('LANINS_132', "mydomain.com");
-define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of [domain]");
+define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of [x]");