diff --git a/e107_admin/db.php b/e107_admin/db.php
index ebbc19631..9710e8d61 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -1462,7 +1462,7 @@ class system_tools
 	 */
 	private function plugin_viewscan($mode = 'update')
 	{
-		$error_messages = array(0 => DBLAN_31, 1 => DBLAN_32, 2 => DBLAN_33, 3 => DBLAN_34);
+		$error_messages = array(0 => DBLAN_31, 1 => LAN_ERROR, 2 => DBLAN_33, 3 => DBLAN_34);
 	//	$error_image = array("integrity_pass.png", "integrity_fail.png", "warning.png", "blank.png");
 		$error_glyph = array(ADMIN_TRUE_ICON,ADMIN_FALSE_ICON,"<i class='S16 e-warning-16'></i>","<i style='display:inline-block;width:17px;height:16px;'> </i>");
 		
diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php
index 1c6cc2137..cedfd393a 100644
--- a/e107_core/shortcodes/batch/comment_shortcodes.php
+++ b/e107_core/shortcodes/batch/comment_shortcodes.php
@@ -186,7 +186,7 @@ class comment_shortcodes extends e_shortcode
 		}
 		
 		// TODO put into a <ul> drop-down format. 
-		$text = "<a href='#' data-target='".e_HTTP."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete btn btn-default btn-mini btn-xs'>Delete</a> ";
+		$text = "<a href='#' data-target='".e_HTTP."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete btn btn-default btn-mini btn-xs'>".LAN_DELETE."</a> ";
 		
 		if($this->var['comment_blocked'] == 2) // pending approval. 
 		{
@@ -198,7 +198,7 @@ class comment_shortcodes extends e_shortcode
 		
 		$unblock 	= "[<a href='".e_ADMIN_ABS."comment.php?unblock-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_1."</a>] ";
 		$block 		= "[<a href='".e_ADMIN_ABS."comment.php?block-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_2."</a>] ";
-		$delete 	= "[<a href='".e_ADMIN_ABS."comment.php?delete-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_3."</a>] ";
+		$delete 	= "[<a href='".e_ADMIN_ABS."comment.php?delete-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".LAN_DELETE."</a>] ";
 		$userinfo 	= "[<a href='".e_ADMIN_ABS."userinfo.php?".e107::getIPHandler()->ipDecode($comrow['comment_ip'])."'>".COMLAN_4."</a>]";
 			
 		return $unblock.$block.$delete.$userinfo;
diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php
index 2e657a564..c3c29d432 100644
--- a/e107_handlers/upload_handler.php
+++ b/e107_handlers/upload_handler.php
@@ -388,7 +388,7 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
 						$error = LANUPLOAD_16;
 				}
 
-				$uploaded[$c]['message'] = LANUPLOAD_11." '".$name."' <br />".LANUPLOAD_12.": ".$error;
+				$uploaded[$c]['message'] = LANUPLOAD_11." '".$name."' <br />".LAN_ERROR.": ".$error;
 				$uploaded[$c]['line'] = __LINE__;
 				$uploaded[$c]['file'] = __FILE__;
 				
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index eaf8f4ac5..65f6a06c9 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -41,7 +41,7 @@ define("CORE_LAN_GB", "GB");
 define("CORE_LAN_TB", "TB");
 
 define("EMESSLAN_TITLE_INFO", "System Information");
-define("EMESSLAN_TITLE_ERROR", "Error");
+//define("EMESSLAN_TITLE_ERROR", "Error"); new > LAN_ERROR
 define("EMESSLAN_TITLE_SUCCESS", "Success");
 define("EMESSLAN_TITLE_WARNING", "Warning");
 define("EMESSLAN_TITLE_DEBUG", "System Debug");
diff --git a/e107_languages/English/admin/lan_db.php b/e107_languages/English/admin/lan_db.php
index 36d6cf364..1306ffc79 100644
--- a/e107_languages/English/admin/lan_db.php
+++ b/e107_languages/English/admin/lan_db.php
@@ -38,7 +38,7 @@ define("DBLAN_28", "Select to scan plugin directories for changes");
 define("DBLAN_29", "Scan plugin directories");
 define("DBLAN_30", "If an addon shows an error, check for characters outside the PHP opening/closing tags.");
 define("DBLAN_31", "Pass");
-define("DBLAN_32", "Error");
+//define("DBLAN_32", "Error"); new > LAN_ERROR
 define("DBLAN_33", "Inaccessible");
 define("DBLAN_34", "Not checked");
 
diff --git a/e107_languages/English/lan_comment.php b/e107_languages/English/lan_comment.php
index fd7e5c0eb..6fcba18ba 100644
--- a/e107_languages/English/lan_comment.php
+++ b/e107_languages/English/lan_comment.php
@@ -13,7 +13,7 @@
 define("COMLAN_0", "[blocked by admin]");
 define("COMLAN_1", "Unblock");
 define("COMLAN_2", "Block");
-define("COMLAN_3", "Delete");
+//define("COMLAN_3", "Delete"); //new > LAN_DELETE
 define("COMLAN_4", "Info");
 define("COMLAN_5", "Comments ...");
 define("COMLAN_6", "You must be logged in to make comments on this site - please log in, or if you are not registered click");
diff --git a/e107_languages/English/lan_email.php b/e107_languages/English/lan_email.php
index 530483ebc..2b366dc55 100644
--- a/e107_languages/English/lan_email.php
+++ b/e107_languages/English/lan_email.php
@@ -22,7 +22,7 @@ define("LAN_EMAIL_8", "Comment");
 define("LAN_EMAIL_9", "Sorry - unable to send email");
 define("LAN_EMAIL_10", "Mail sent to");
 define("LAN_EMAIL_11", "Email sent");
-define("LAN_EMAIL_12", "Error");
+//define("LAN_EMAIL_12", "Error"); // new > LAN_ERROR
 define("LAN_EMAIL_13", "Email article to a friend");
 define("LAN_EMAIL_14", "Email news_item to a friend");
 define("LAN_EMAIL_15", "Username: ");
diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index 8dd844820..85f00389f 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -27,7 +27,7 @@ define("LANINS_008", "PHP &amp; MySQL Versions Check / File Permissions Check");
 define("LANINS_009", "Retest File Permissions");
 define("LANINS_010", "File not writable: ");
 define("LANINS_010a", "Folder not writable: ");
-define("LANINS_011", "Error");
+//define("LANINS_011", "Error"); new > LAN_ERROR
 define("LANINS_012", "MySQL Functions don't seem to exist. This probably means that either the MySQL PHP Extension isn't installed or your PHP installation wasn't compiled with MySQL support."); // help for 012
 define("LANINS_013", "Couldn't determine your MySQL version number. This is a non fatal error, so please continue installing, but be aware that e107 requires MySQL >= 3.23 to function correctly.");
 define("LANINS_014", "File Permissions");
diff --git a/e107_languages/English/lan_upload_handler.php b/e107_languages/English/lan_upload_handler.php
index 286baac9d..dbe61c589 100644
--- a/e107_languages/English/lan_upload_handler.php
+++ b/e107_languages/English/lan_upload_handler.php
@@ -20,7 +20,7 @@ define("LANUPLOAD_8", "No file was uploaded.");
 define("LANUPLOAD_9", "Uploaded file size 0 bytes");
 define("LANUPLOAD_10", "Upload failed [Duplicate filename] - A file with the same name already exists.");
 define("LANUPLOAD_11", "The file did not upload. Filename: ");
-define("LANUPLOAD_12", "Error");
+//define("LANUPLOAD_12", "Error"); new > LAN_ERROR
 define("LANUPLOAD_13", "Missing temporary folder");
 define("LANUPLOAD_14", "File write failed");
 define("LANUPLOAD_15", "Upload not allowed");
diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index c032011c9..93febe574 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -1643,7 +1643,7 @@ require_once(HEADERF);
 
 if (vartrue($error))
 {
-	$ns->tablerender(EMESSLAN_TITLE_ERROR, $error); // LAN?
+	$ns->tablerender(LAN_ERROR, $error); // LAN?
 }
 
 
diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php
index a2136cb1e..050f96d9f 100644
--- a/e107_plugins/forum/languages/English/English_front.php
+++ b/e107_plugins/forum/languages/English/English_front.php
@@ -530,7 +530,7 @@ define("LAN_10", "Login");
 define("LAN_11", "Remember me");
 define("LAN_16", "Username: ");
 define("LAN_17", "Password: ");
-define("LAN_20", "Error");
+define("LAN_20", "Error");//new > LAN_ERROR
 define("LAN_27", "You left required field(s) blank");
 define("LAN_28", "You didn't post anything ..");
 define("LAN_29", "Edited");
diff --git a/e107_plugins/page/e_search.php b/e107_plugins/page/e_search.php
index 21e83abe1..4c8680c9a 100644
--- a/e107_plugins/page/e_search.php
+++ b/e107_plugins/page/e_search.php
@@ -174,4 +174,4 @@ class page_search extends e_search // include plugin-folder in the name.
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/e107_plugins/pm/languages/English.php b/e107_plugins/pm/languages/English.php
index 798e474f0..5dcaf2340 100755
--- a/e107_plugins/pm/languages/English.php
+++ b/e107_plugins/pm/languages/English.php
@@ -52,7 +52,7 @@ define('LAN_PM_48', "ERROR: Block not added, unknown error");
 define('LAN_PM_49', "ERROR: Block already in place for {UNAME}");
 define('LAN_PM_50', "Block User");
 define('LAN_PM_51', "Unblock User");
-define('LAN_PM_52', "Delete");
+//define('LAN_PM_52', "Delete"); '' new > LAN_DELETE
 define('LAN_PM_53', "Delete Selected");
 define('LAN_PM_54', "Quote original");
 define('LAN_PM_55', "Send Reply");
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 3ea5efd79..e4811e37b 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -470,7 +470,7 @@ if(!class_exists('pm_shortcodes'))
 			}
 			if($extra !== 'inbox' && $extra !== 'outbox') return '';
 			$action = $extra == 'outbox' ? 'delete-out' : 'delete-in';
-			return "<a href='".$this->url('action/'.$action, 'id='.$this->var['pm_id'])."'><img src='".e_PLUGIN_ABS."pm/images/mail_delete.png' title='".LAN_PM_52."' alt='".LAN_PM_52."' class='icon S16' /></a>";
+			return "<a href='".$this->url('action/'.$action, 'id='.$this->var['pm_id'])."'><img src='".e_PLUGIN_ABS."pm/images/mail_delete.png' title='".LAN_DELETE."' alt='".LAN_DELETE."' class='icon S16' /></a>";
 		}
 
 
@@ -597,7 +597,7 @@ if(!class_exists('pm_shortcodes'))
 
 		public function sc_pm_blocked_delete()
 		{
-			return "<a href='".$this->url('action/delete-blocked', array('id' => $this->pmBlocked['pm_block_from']))."'><img src='".e_PLUGIN_ABS."pm/images/mail_delete.png' title='".LAN_PM_52."' alt='".LAN_PM_52."' class='icon S16' /></a>";
+			return "<a href='".$this->url('action/delete-blocked', array('id' => $this->pmBlocked['pm_block_from']))."'><img src='".e_PLUGIN_ABS."pm/images/mail_delete.png' title='".LAN_DELETE."' alt='".LAN_DELETE."' class='icon S16' /></a>";
 		}
 
 
diff --git a/e107_themes/_blank/languages/English.php b/e107_themes/_blank/languages/English.php
index e8fc237f8..822357ef8 100644
--- a/e107_themes/_blank/languages/English.php
+++ b/e107_themes/_blank/languages/English.php
@@ -1,6 +1,6 @@
 <?php
 define("EMESSLAN_TITLE_INFO", "System Information");
-define("EMESSLAN_TITLE_ERROR", "Error");
+//define("EMESSLAN_TITLE_ERROR", "Error");//new > LAN_ERROR
 define("EMESSLAN_TITLE_SUCCESS", "Success");
 define("EMESSLAN_TITLE_WARNING", "Warning");
 define("EMESSLAN_TITLE_DEBUG", "System Debug");