Some language file cleanup. Undetected phrases have been disabled.

2025-08-02 20:57:26 +02:00 · 2009-11-08 09:14:39 +00:00
parent 7744f38ed9
commit 15a83d309a
26 changed files with 220 additions and 235 deletions
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -9,9 +9,9 @@
 * Administration Area - Admin Log
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
- * $Revision: 1.30 $
- * $Date: 2009-08-28 16:10:50 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.31 $
+ * $Date: 2009-11-08 09:14:22 $
+ * $Author: e107coders $
 *
 */

@@ -213,7 +213,7 @@ if(($action == "confdel") || ($action == "auditdel"))
 	$text = "
 		<form method='post' action='".e_SELF."?backdel.{$qs[1]}.{$qs[2]}'>
 			<fieldset id='core-admin-log-confirm-delete'>
-				<legend class='e-hideme'>".RL_LAN_051."</legend>
+				<legend class='e-hideme'>".LAN_CONFDELETE."</legend>
 				<table cellpadding='0' cellspacing='0' class='adminform'>
 					<tr>
 						<td class='center'>
@@ -224,14 +224,14 @@ if(($action == "confdel") || ($action == "auditdel"))
 				<div class='buttons-bar center'>
 					<input type='hidden' name='backdeltype' value='{$action}' />
 					<button class='delete' type='submit' name='confirmdeleteold' value='no-value'><span>".RL_LAN_049."</span></button>
-					<button class='cancel' type='submit' name='confirmcancelold' value='no-value'><span>".RL_LAN_055."</span></button>
+					<button class='cancel' type='submit' name='confirmcancelold' value='no-value'><span>".LAN_CANCEL."</span></button>
 				</div>
 			</fieldset>
 		</form>

 	";

-	$ns->tablerender(RL_LAN_051, $text);
+	$ns->tablerender(LAN_CONFDELETE, $text);
 }

 // Arrays of options for the various logs - the $page_title array is used to determine the allowable values for $action ('options' is a special case)
@@ -519,7 +519,7 @@ if(isset($page_title[$action]))
 	$col_widths = array('adminlog' => array(18, 4, 14, 7, 15, 8, 14, 20), // Date - Pri - IP - UID - User - Code - Event - Info
 'auditlog' => array(18, 14, 7, 15, 8, 14, 24), 'rolllog' => array(15, 4, 12, 6, 12, 7, 13, 13, 18), // Date - Pri - IP - UID - User - Code - Caller - Event - Info
 'downlog' => array(18, 14, 7, 15, 8, 38), 'detailed' => array(10, 8, 6, 4, 14, 6, 17, 7, 17, 21), 'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1), 'online' => array(18, 15, 7, 14, 32, 6, 4, 4));
-	$col_titles = array('adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), 'detailed' => array(RL_LAN_097, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'comments' => array(RL_LAN_019, RL_LAN_100, RL_LAN_101, RL_LAN_102, RL_LAN_103, RL_LAN_104, RL_LAN_105, RL_LAN_020, RL_LAN_106, RL_LAN_107, RL_LAN_108, RL_LAN_109, RL_LAN_110), 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116));
+	$col_titles = array('adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'comments' => array(RL_LAN_019, RL_LAN_100, RL_LAN_101, RL_LAN_102, RL_LAN_103, RL_LAN_104, LAN_AUTHOR, RL_LAN_020, RL_LAN_106, RL_LAN_107, RL_LAN_108, RL_LAN_109, RL_LAN_110), 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116));

 	// For DB where the delete option is available, specifies the ID field
 	$delete_field = array('comments' => 'comment_id');
@@ -1028,7 +1028,7 @@ function admin_log_adminmenu()
 	$var['comments']['text'] = 'Comments';
 	$var['comments']['link'] = "admin_log.php?comments";

-	$var['config']['text'] = RL_LAN_027;
+	$var['config']['text'] = LAN_OPTIONS;
 	$var['config']['link'] = "admin_log.php?config";

 	/* XXX - why?!
@@ -1068,7 +1068,7 @@ function headerjs()
 	$ret = "
 		<script type='text/javascript'>
 			//add required core lan - delete confirm message
-			(".e_jshelper::toString(RL_LAN_JS_CONFIRM).").addModLan('core', 'delete_confirm');
+			(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
 		</script>
 		<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
 	";
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -9,8 +9,8 @@
 * Ban List Management
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
- * $Revision: 1.20 $
- * $Date: 2009-11-07 02:10:34 $
+ * $Revision: 1.21 $
+ * $Date: 2009-11-08 09:14:22 $
 * $Author: e107coders $
 *
 */
@@ -820,7 +820,7 @@ function banlist_adminmenu()
 		$var['times']['link'] = e_SELF."?times";
 		$var['times']['perm'] = "0";

-		$var['options']['text'] = BANLAN_62;
+		$var['options']['text'] = LAN_OPTIONS;
 		$var['options']['link'] = e_SELF."?options";
 		$var['options']['perm'] = "0";
 	}
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -9,8 +9,8 @@
 * Administration - Database Utilities
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
- * $Revision: 1.37 $
- * $Date: 2009-10-26 01:04:05 $
+ * $Revision: 1.38 $
+ * $Date: 2009-11-08 09:14:22 $
 * $Author: e107coders $
 *
 */
@@ -577,8 +577,8 @@ class system_tools
 							</tbody>
 						</table>
 						<div class='buttons-bar center'>
-							".$frm->admin_button('delpref_checked', DBLAN_21, 'delete')."
-							".$frm->admin_button('back', DBLAN_13, 'back')."
+							".$frm->admin_button('delpref_checked', LAN_DELCHECKED, 'delete')."
+							".$frm->admin_button('back', LAN_BACK, 'back')."
 							<input type='hidden' name='pref_type' value='".$type."' />
 						</div>
 					</fieldset>
@@ -645,12 +645,12 @@ class system_tools
 	
 		/* we all are awaiting for PHP5 only support - method chaining...
 		$emessage->add(DBLAN_22.' - '.DBLAN_23, E_MESSAGE_SUCCESS)
-				 ->add("<a href='".e_SELF."'>".DBLAN_13."</a>", E_MESSAGE_SUCCESS)
+				 ->add("<a href='".e_SELF."'>".LAN_BACK."</a>", E_MESSAGE_SUCCESS)
 				 ->add(DBLAN_30);
 		*/
 	
 		$emessage->add(DBLAN_23, E_MESSAGE_SUCCESS);
-		$emessage->add("<a href='".e_SELF."'>".DBLAN_13."</a>", E_MESSAGE_SUCCESS);
+		$emessage->add("<a href='".e_SELF."'>".LAN_BACK."</a>", E_MESSAGE_SUCCESS);
 		$emessage->add(DBLAN_30);
 	
 		$text = "
@@ -913,7 +913,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
 			}

 			$emessage->add($qry, E_MESSAGE_DEBUG);
-			$emessage->add("<a href='".e_SELF."'>".DBLAN_13."</a>", E_MESSAGE_DEBUG);
+			$emessage->add("<a href='".e_SELF."'>".LAN_BACK."</a>", E_MESSAGE_DEBUG);
 		}
 	}

@@ -958,7 +958,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
 					</table>
 					<div class='buttons-bar center'>
 						".$frm->admin_button('check_verify_sql_record', DBLAN_38)."
-						".$frm->admin_button('back', DBLAN_13, 'back')."
+						".$frm->admin_button('back', LAN_BACK, 'back')."
 					</div>
 				</fieldset>
 			</form>
@@ -1013,7 +1013,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
 									<th>".DBLAN_41."</th>
 									<th>".DBLAN_42."</th>
 									<th>".DBLAN_43."</th>
-									<th class='center last'>".DBLAN_44."</th>
+									<th class='center last'>".LAN_OPTIONS."</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -1031,7 +1031,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
 										<td>{$v['itemid']}</td>
 										<td>".($v['table_exist'] ? DBLAN_45 : DBLAN_46)."</td>
 										<td class='center'>
-											".$frm->checkbox('del_dbrec['.$ctype.']['.$delkey.'][]', '1').$frm->label(DBLAN_47, 'del_dbrec['.$ctype.']['.$delkey.'][]', '1')."
+											".$frm->checkbox('del_dbrec['.$ctype.']['.$delkey.'][]', '1').$frm->label(LAN_DELETE, 'del_dbrec['.$ctype.']['.$delkey.'][]', '1')."
 										</td>
 									</tr>
 					";
@@ -1263,8 +1263,8 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).

 		$text .= "
 				<div class='buttons-bar center'>
-					".$frm->admin_button('delete_verify_sql_record', DBLAN_48, 'delete')."
-					".$frm->admin_button('verify_sql_record', DBLAN_13, 'back')."
+					".$frm->admin_button('delete_verify_sql_record', LAN_DELCHECKED, 'delete')."
+					".$frm->admin_button('verify_sql_record', LAN_BACK, 'back')."

 				</div>
 			</form>
--- a/e107_admin/fla.php
+++ b/e107_admin/fla.php
@@ -9,9 +9,9 @@
 * Manage/View failed login attempts
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $
- * $Revision: 1.8 $
- * $Date: 2009-07-18 13:08:37 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.9 $
+ * $Date: 2009-11-08 09:14:22 $
+ * $Author: e107coders $
 *
 */
 require_once("../class2.php");
@@ -146,7 +146,7 @@ else
 	$text = "
 		<form method='post' action='".e_SELF."' id='flaform' >
 			<fieldset id='core-fla'>
-				<legend class='e-hideme'>".FLALAN_1."</legend>
+				<legend class='e-hideme'>".ADLAN_146."</legend>
 				<table cellpadding='0' cellspacing='0' class='adminlist'>
 					<colgroup span='5'>
 						<col style='width: 20%'></col>
@@ -157,7 +157,7 @@ else
 					</colgroup>
 					<thead>
 						<tr>
-							<th>".FLALAN_6."</th>
+							<th>".LAN_DATE."</th>
 							<th>".FLALAN_7."</th>
 							<th>".FLALAN_8."</th>
 							<th class='center last'>
@@ -214,7 +214,7 @@ else

 }

-$e107->ns->tablerender(FLALAN_1, $emessage->render().$text);
+$e107->ns->tablerender(ADLAN_146, $emessage->render().$text);

 require_once("footer.php");
 /**
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -9,8 +9,8 @@
 * Image Administration Area
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
- * $Revision: 1.26 $
- * $Date: 2009-11-07 11:20:26 $
+ * $Revision: 1.27 $
+ * $Date: 2009-11-08 09:14:22 $
 * $Author: e107coders $
 *
 */
@@ -450,9 +450,9 @@ function show_avatars()
 			<div class='spacer clear'>
 				<div class='buttons-bar'>
 					<input type='hidden' name='show_avatars' value='1' />
-					".$frm->admin_button('check_all', IMALAN_59, 'action')."
-					".$frm->admin_button('uncheck_all', IMALAN_60, 'action')."
-					".$frm->admin_button('submit_show_delete_multi', IMALAN_58, 'delete')."
+					".$frm->admin_button('check_all', LAN_CHECKALL, 'action')."
+					".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'action')."
+					".$frm->admin_button('submit_show_delete_multi', LAN_DELCHECKED, 'delete')."
 					".$frm->admin_button('submit_show_deleteall', IMALAN_25, 'delete')."
 					".$frm->admin_button('submit_cancel_show', IMALAN_68, 'cancel')."
 				</div>
@@ -495,9 +495,9 @@ if (isset($_POST['check_avatar_sizes']))
 				<thead>
 					<tr>
 						<th class='center'>".LAN_OPTIONS."</th>
-						<th class='center'>".IMALAN_64."</th>
+						<th class='center'>".LAN_USER."</th>
 						<th class='center'>".IMALAN_62."</th>
-						<th class='center last'>".IMALAN_63."</th>
+						<th class='center last'>".LAN_URL."</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -593,9 +593,9 @@ if (isset($_POST['check_avatar_sizes']))
 			</table>
 			<div class='buttons-bar'>
 				<input type='hidden' name='check_avatar_sizes' value='1' />
-				".$frm->admin_button('check_all', IMALAN_59, 'action')."
-				".$frm->admin_button('uncheck_all', IMALAN_60, 'action')."
-				".$frm->admin_button('submit_avdelete_multi', IMALAN_58, 'delete')."
+				".$frm->admin_button('check_all', LAN_CHECKALL, 'action')."
+				".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'action')."
+				".$frm->admin_button('submit_avdelete_multi', LAN_DELCHECKED, 'delete')."
 			</div>
 		</fieldset>
 	</form>
@@ -762,7 +762,7 @@ if (isset($_POST['check_avatar_sizes']))
 						<tr>
 							<td class='label'>".IMALAN_36."</td>
 							<td class='control'>
-								".$frm->admin_button('check_avatar_sizes', IMALAN_17)."
+								".$frm->admin_button('check_avatar_sizes', ADLAN_145)."
 							</td>
 						</tr>
 					</tbody>
@@ -924,7 +924,7 @@ function headerjs()
 	$ret = "
 		<script type='text/javascript'>
 			//add required core lan - delete confirm message
-			(".e_jshelper::toString(IMALAN_67).").addModLan('core', 'delete_confirm');
+			(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
 		</script>
 		<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
 	";
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -9,8 +9,8 @@
 * Administration Area - Languages
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
- * $Revision: 1.25 $
- * $Date: 2009-11-07 11:34:22 $
+ * $Revision: 1.26 $
+ * $Date: 2009-11-08 09:14:22 $
 * $Author: e107coders $
 *
 */
@@ -298,7 +298,7 @@ if (isset($_POST['edit_existing']))
 						</td>
 					</tr>
 					<tr>
-						<td class='label'><strong>".LANG_LAN_10."</strong></td>
+						<td class='label'><strong>".LAN_CONFDELETE."</strong></td>
 						<td class='control'>
 							".$frm->checkbox('remove', 1)."
 							<div class='smalltext field-help'>".$frm->label(LANG_LAN_11, 'remove', 1)."</div>
@@ -523,7 +523,7 @@ function multilang_db()
 			{
 				//FIXME sprintf
 				$text .= "<button class='edit' type='submit' name='edit_existing' value='no-value'><span>".LAN_EDIT."</span></button>
-						<button class='delete' type='submit' name='del_existing' value='no-value' title='".sprintf(LANG_LAN_33, $e_language).' '.LANG_LAN_09."'><span>".LAN_DELETE."</span></button>";
+						<button class='delete' type='submit' name='del_existing' value='no-value' title='".sprintf(LANG_LAN_33, $e_language).' '.LAN_JSCONFIRM."'><span>".LAN_DELETE."</span></button>";
 			}
 			elseif ($e_language != $pref['sitelanguage'])
 			{
@@ -635,9 +635,12 @@ function show_tools()
 									$fl->mode = 'full';
 									$lans = $fl->get_files(e_LANGUAGEDIR."English/admin");
 									
+									$exclude = array('lan_admin.php');							
+									
+									
 									foreach($lans as $script=>$lan)
 									{								
-										if(basename($lan)=='lan_admin.php')
+										if(in_array(basename($lan),$exclude))
 										{
 											continue;
 										}
@@ -950,7 +953,7 @@ function getDefined($line)



-function compareit($needle,$haystack,$value='',$disabled){
+function compareit($needle,$haystack,$value='',$disabled=FALSE){
 	
 	
 //	return "Need=".$needle."<br />hack=".$haystack."<br />val=".$val;
@@ -990,11 +993,17 @@ function compareit($needle,$haystack,$value='',$disabled){
 		$count = 1;
 		foreach($lines as $ln)
 		{	
-			if(strpos($ln,$needle.'.')!==FALSE || strpos($ln,$needle.';')!==FALSE || strpos($ln,$needle.';')!==FALSE)
+			if(preg_match("/\b".$needle."\b/i",$ln))
 			{
+				if($disabled)
+				{
+					$text .= ADMIN_WARNING_ICON;
+				}	
 				$text .= " Line:<b>".$count."</b>  "; // "' Found";
+
 				$found = TRUE;
 			}
+
 			$count++;	
 		}

@@ -1051,7 +1060,7 @@ function headerjs()
 		<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
 		<script type='text/javascript'>
 			//add required core lan - delete confirm message
-			(".e_jshelper::toString(LANG_LAN_09).").addModLan('core', 'delete_confirm');
+			(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');

 			//core object
 			e107Admin.CoreLanguage = {};
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -10,9 +10,9 @@
 * Administration Area - Users
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
-* $Revision: 1.62 $
-* $Date: 2009-11-05 17:32:17 $
-* $Author: secretr $
+* $Revision: 1.63 $
+* $Date: 2009-11-08 09:14:22 $
+* $Author: e107coders $
 *
 */
 require_once ('../class2.php');
@@ -555,7 +555,7 @@ class users
 		$this->fields = array(
 			'checkboxes' 		=> array('title' => '','width' => '3%','forced' => true,'thclass' => 'center first'),
 			'user_id' 			=> array('title' => 'Id','width' => '5%','forced' => true),
-			'user_status' 		=> array('title' => ADLAN_134,'width' => 'auto', 'nosort'=>TRUE),
+			'user_status' 		=> array('title' => LAN_STATUS,'width' => 'auto', 'nosort'=>TRUE),
 			'user_name' 		=> array('title' => LAN_USER_01,'type' => 'text','width' => 'auto','thclass' => 'left first'), // Display name
 	 		'user_loginname' 	=> array('title' => LAN_USER_02,'type' => 'text','width' => 'auto'), // User name
 	 		'user_login' 		=> array('title' => LAN_USER_03,'type' => 'text','width' => 'auto'), // Real name (no real vetting)
--- a/e107_files/shortcode/batch/admin_shortcodes_class.php
+++ b/e107_files/shortcode/batch/admin_shortcodes_class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: admin_shortcodes_class.php,v 1.29 2009-11-05 09:15:19 e107coders Exp $
+* $Id: admin_shortcodes_class.php,v 1.30 2009-11-08 09:14:28 e107coders Exp $
 *
 * Admin shortcode batch - class
 */
@@ -848,7 +848,7 @@ class admin_shortcodes
 						$text .= "<img src='".e_IMAGE."admin_images/failedlogin_16.png' alt='' class='icon S16' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
 					}
 					$text .= "</div>";
-					return $ns -> tablerender(ADLAN_134, $text, '', TRUE);
+					return $ns -> tablerender(LAN_STATUS, $text, '', TRUE);
 				}
 			}

--- a/e107_images/banners/banner2.png
+++ b/e107_images/banners/banner2.png
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.34 2009-11-07 11:20:33 e107coders Exp $
+ * $Id: lan_admin.php,v 1.35 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 */
@@ -142,7 +142,6 @@ define("ADLAN_121", "Install");
 define("ADLAN_132", "Language");
 define("ADLAN_133", "default");

-define("ADLAN_134", "Status");
 define("ADLAN_135", "Admin Log");

 define("ADLAN_136", "Mail");
@@ -307,5 +306,7 @@ define("LAN_COMMENTMAN", "Comments Manager");

 define("LAN_FILTER", "Filter");
 define("LAN_NO_RECORDS", "No Records Found");
-
+define("LAN_STATUS", "Status");
+define("LAN_URL", "URL");
+define("LAN_USER", "User");

--- a/e107_languages/English/admin/lan_admin_log.php
+++ b/e107_languages/English/admin/lan_admin_log.php
@@ -1,18 +1,18 @@
 <?php
 // e107 Language File.
-// $Id: lan_admin_log.php,v 1.8 2008-12-16 14:22:01 secretr Exp $
+// $Id: lan_admin_log.php,v 1.9 2009-11-08 09:14:39 e107coders Exp $

-define('RL_LAN_001', 'System Logs');
+//define('RL_LAN_001', 'System Logs');
 define('RL_LAN_002', "Rolling Log");
-define('RL_LAN_003', 'User Audit Trail Maintenance');
+// define('RL_LAN_003', 'User Audit Trail Maintenance');
 //define('RL_LAN_004', "Admin/Rolling Log Upgraded");
 define('RL_LAN_005', "Configure/View system logs");
 define('RL_LAN_006', "Options Updated");
-define('RL_LAN_007', "User Audit Trail Options");
+// define('RL_LAN_007', "User Audit Trail Options");
 define('RL_LAN_008', "Rolling Log is active:");
 define('RL_LAN_009', "Rolling Log History length in days");
 define('RL_LAN_010', "Update Options");
-define('RL_LAN_011', 'Rolling Log Configuration');
+// define('RL_LAN_011', 'Rolling Log Configuration');
 define('RL_LAN_012', "Filter Options");
 define('RL_LAN_013', "Start date/time");
 define('RL_LAN_014', "End date/time");
@@ -28,7 +28,7 @@ define('RL_LAN_023', "Event Type");
 define('RL_LAN_024', "From");
 define('RL_LAN_025', "Event Title");
 define('RL_LAN_026', "Class for which user actions logged");
-define('RL_LAN_027', "Options");
+// define('RL_LAN_027', "Options");
 define('RL_LAN_028', "Update Filters");
 define('RL_LAN_029', "Event type filter");
 define('RL_LAN_030', "Admin Log");
@@ -39,14 +39,14 @@ define('RL_LAN_044', "Log events to display per page");
 define('RL_LAN_045', "Delete admin log events older than ");
 define('RL_LAN_046', " days");
 define('RL_LAN_047', "Confirm delete admin log events older than ");
-define('RL_LAN_048', "Admin log maintenance");
+// define('RL_LAN_048', "Admin log maintenance");
 define('RL_LAN_049', "Delete old entries");
 define('RL_LAN_050', "Parameter error - nothing deleted");
-define('RL_LAN_051', "Confirm Delete");
+// define('RL_LAN_051', "Confirm Delete");
 define('RL_LAN_052', "Admin log");
 define('RL_LAN_053', "User Audit Log");
 define('RL_LAN_054', "Nothing to delete, or database error");
-define('RL_LAN_055', "Cancel");
+// define('RL_LAN_055', "Cancel");
 define('RL_LAN_056', "Nothing deleted");
 define('RL_LAN_057', " - events older than --OLD-- (--NUM-- entries) deleted");
 define('RL_LAN_058', "Priority Filter:");
@@ -54,7 +54,7 @@ define('RL_LAN_059', "Caller Filter:");
 define('RL_LAN_060', "IP Address Filter:");
 define('RL_LAN_061', "Wildcard (*) at end acceptable");
 define('RL_LAN_062', 'User Audit Log');
-define('RL_LAN_063', 'User audit settings updated');
+// define('RL_LAN_063', 'User audit settings updated');
 define('RL_LAN_064', 'Applicable to all logs');
 define('RL_LAN_065', "Confirm delete user audit log events older than ");
 define('RL_LAN_066', "Delete user audit trail log events older than ");
@@ -79,9 +79,9 @@ define('RL_LAN_091', 'Detailed timings');
 define('RL_LAN_092', 'Time period');
 define('RL_LAN_093', '(mins)');
 define('RL_LAN_094', 'Detailed timing analysis');
-define('RL_LAN_095', 'Logs to include');
+// define('RL_LAN_095', 'Logs to include');
 define('RL_LAN_096', 'Diff (s)');
-define('RL_LAN_097', 'Time');
+// define('RL_LAN_097', 'Time');
 define('RL_LAN_098', 'Source');
 define('RL_LAN_099', 'Comments');
 define('RL_LAN_100', 'CID');			// Comment ID field
@@ -89,7 +89,7 @@ define('RL_LAN_101', 'PID');
 define('RL_LAN_102', 'ID');
 define('RL_LAN_103', 'Subject');
 define('RL_LAN_104', 'UID');
-define('RL_LAN_105', 'Author');
+// define('RL_LAN_105', 'Author');
 define('RL_LAN_106', 'Type');
 define('RL_LAN_107', 'Comment');
 define('RL_LAN_108', 'BK');				// Comment blocked
@@ -103,7 +103,7 @@ define('RL_LAN_115', 'Users Admin');
 define('RL_LAN_116', 'Location');
 define('RL_LAN_117', 'PgCnt');
 define('RL_LAN_118', 'Flag');
-define('RL_LAN_119', 'Active');
+// define('RL_LAN_119', 'Active');
 define('RL_LAN_120', 'Users on-line');


@@ -113,5 +113,5 @@ define('RL_LAN_123', 'User audit trail class');
 define('RL_LAN_124', 'User audit trail actions');
 define('RL_LAN_125', 'System Logs Maintenance');
 define('RL_LAN_126', 'Total <strong>%d</strong> entries matching search condition');
-define('RL_LAN_JS_CONFIRM', 'Are you sure?');
+// define('RL_LAN_JS_CONFIRM', 'Are you sure?');
 ?>
--- a/e107_languages/English/admin/lan_administrator.php
+++ b/e107_languages/English/admin/lan_administrator.php
@@ -9,14 +9,14 @@
 * Admin Language File
 *
 * $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_administrator.php,v $
- * $Revision: 1.8 $
- * $Date: 2009-08-05 14:22:15 $
+ * $Revision: 1.9 $
+ * $Date: 2009-11-08 09:14:39 $
 * $Author: e107coders $
 */
 //define("ADMSLAN_0", "New user/admin entry created for"); - no references found
 //define("ADMSLAN_1", "now has admin status."); - no references found

-define("ADMSLAN_3", "is the main site administrator and cannot be edited.");
+//define("ADMSLAN_3", "is the main site administrator and cannot be edited.");
 define("ADMSLAN_4", "Continue");
 //define("ADMSLAN_5", "Error!"); - global admin LAN_ERROR
 define("ADMSLAN_6", "is the main site administrator and cannot be deleted.");
@@ -25,7 +25,7 @@ define("ADMSLAN_13", "Existing Administrators");


 define("ADMSLAN_16", "Admin Name");
-define("ADMSLAN_17", "Admin Password");
+// define("ADMSLAN_17", "Admin Password");
 define("ADMSLAN_18", "Permissions");
 define("ADMSLAN_19", "Alter site preferences");
 define("ADMSLAN_20", "Alter Menus");
@@ -50,7 +50,7 @@ define("ADMSLAN_37", "Moderate comments");
 define("ADMSLAN_39", "Post news");
 define("ADMSLAN_40", "Post links");
 define("ADMSLAN_41", "Create/edit custom menus");  
-//define("ADMSLAN_42", "Post reviews"); - NOW PLUGIN
+define("ADMSLAN_42", "Post reviews"); // - NOW PLUGIN
 define("ADMSLAN_43", "Configure URLs");
 define("ADMSLAN_44", "Post downloads");
 define("ADMSLAN_45", "Schedule Tasks");
@@ -60,16 +60,15 @@ define("ADMSLAN_47", "Moderate submitted news");
 //define("ADMSLAN_49", "Check All"); - global admin lan
 //define("ADMSLAN_51", "Uncheck All"); - global admin lan
 define("ADMSLAN_52", "Update administrator");
-define("ADMSLAN_53", "Add administrator");
-define("ADMSLAN_54", "Site Administrators");
-
-define("ADMSLAN_55", "Field(s) left blank");
+// define("ADMSLAN_53", "Add administrator");
+// define("ADMSLAN_54", "Site Administrators");
+// define("ADMSLAN_55", "Field(s) left blank");

 define("ADMSLAN_56", "Site Administrator");

 define("ADMSLAN_58", "Main Site Administrator");
 define("ADMSLAN_59", "Remove Admin Status");
-define("ADMSLAN_60", "Are you sure you want to remove admin status from");
+// define("ADMSLAN_60", "Are you sure you want to remove admin status from");
 define("ADMSLAN_61", "Administrator deleted");

 define("ADMSLAN_62", "Plugin Manager");
@@ -79,7 +78,7 @@ define("ADMSLAN_65", "Configure mail settings and mailout");
 define("ADMSLAN_66", "Configure Search");
 define("ADMSLAN_67", "Scan with file inspector");
 define("ADMSLAN_68", "Configure email notification");
-define("ADMSLAN_69", "is already an administrator and must be edited.");
+// define("ADMSLAN_69", "is already an administrator and must be edited.");

 // 0.8
 define("ADMSLAN_70", "Return to Administrator Listing");
@@ -89,8 +88,8 @@ define('ADMSLAN_72', 'Admin ID: --ID-- name: --NAME-- new permissions: ');
 define('ADMSLAN_73', 'Admin ID: --ID-- name: --NAME--');

 define('ADMSLAN_74', 'General');
-define('ADMSLAN_75', '');
-define("ADMSLAN_76", "Language Configuration");
+// define('ADMSLAN_75', '');
+// define("ADMSLAN_76", "Language Configuration");

 define("ADMSLAN_2", "Site Administrator <strong>%s</strong> updated in database.");
 ?>
--- a/e107_languages/English/admin/lan_banlist.php
+++ b/e107_languages/English/admin/lan_banlist.php
@@ -4,15 +4,15 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $
-|     $Revision: 1.9 $
-|     $Date: 2009-02-03 21:16:15 $
-|     $Author: e107steved $
+|     $Revision: 1.10 $
+|     $Date: 2009-11-08 09:14:39 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
-define("BANLAN_1", "Ban removed.");
+// define("BANLAN_1", "Ban removed.");
 define("BANLAN_2", 'No bans in list.');
 define("BANLAN_3", "Existing Bans");
-define("BANLAN_4", "Remove ban");
+// define("BANLAN_4", "Remove ban");
 define("BANLAN_5", "Enter IP, email address, or host");
 define("BANLAN_7", "Reason");
 define("BANLAN_8", "Ban Address");
@@ -53,7 +53,7 @@ define('BANLAN_42','Import Choices');
 define('BANLAN_43','Replace all existing imported bans');
 define('BANLAN_44','Use expiry date/time from import');
 define('BANLAN_45','Import');
-define('BANLAN_46','Import File');
+// define('BANLAN_46','Import File');
 define('BANLAN_47','File upload error');
 //define('BANLAN_48','Error importing file');
 define('BANLAN_49','CSV import: Unbalanced quotes in line ');
@@ -69,7 +69,7 @@ define('BANLAN_58','Add users to the whitelist');
 define('BANLAN_59','Edit existing whitelist entry');
 define('BANLAN_60','Edit existing banlist entry');
 define('BANLAN_61','Existing Whitelist entries');
-define('BANLAN_62','Options');
+// define('BANLAN_62','Options');
 define('BANLAN_63','Use reverse DNS to allow host banning');
 define('BANLAN_64','Reverse DNS accesses when adding ban');
 define('BANLAN_65','Turning this option on will allow you to ban users by hostname, rather then just IP or email address.  <br />NOTE: This may affect pageload times on some hosts, or if a server isn\'t responding');
@@ -85,34 +85,34 @@ define('BANLAN_74','Banlist Maintenance');
 define('BANLAN_75','Remove expired bans from list');
 define('BANLAN_76','Execute');
 define('BANLAN_77','Messages/Ban Periods');
-define('BANLAN_78','Hit count exceeded (--HITS-- requests within allotted time)');
-define('BANLAN_79','');
-define('BANLAN_80','');
+// define('BANLAN_78','Hit count exceeded (--HITS-- requests within allotted time)');
+// define('BANLAN_79','');
+// define('BANLAN_80','');

 // Ban types - block reserved 100-109
-define('BANLAN_100', 'Unknown');
-define('BANLAN_101','Manual');
-define('BANLAN_102','Flood');
-define('BANLAN_103','Hit count');
-define('BANLAN_104', 'Login failure');
-define('BANLAN_105', 'Imported');
-define('BANLAN_106', 'User');
-define('BANLAN_107', 'Unknown');
-define('BANLAN_108', 'Unknown');
-define('BANLAN_109', 'Old');
+// define('BANLAN_100', 'Unknown');
+// define('BANLAN_101','Manual');
+// define('BANLAN_102','Flood');
+// define('BANLAN_103','Hit count');
+// define('BANLAN_104', 'Login failure');
+// define('BANLAN_105', 'Imported');
+// define('BANLAN_106', 'User');
+// define('BANLAN_107', 'Unknown');
+// define('BANLAN_108', 'Unknown');
+// define('BANLAN_109', 'Old');

 // Detailed explanations for ban types - block reserved 110-119
-define('BANLAN_110', 'Most likely a ban that was imposed before e107 was upgraded to 0.8');
-define('BANLAN_111', 'Entered by an admin');
-define('BANLAN_112', 'Attempts to update the site too fast');
-define('BANLAN_113', 'Attempts to access the site too frequently from the same address');
-define('BANLAN_114', 'Multiple failed login attempts from the same user');
-define('BANLAN_115', 'Added from an external list');
-define('BANLAN_116', 'IP address banned on account of user ban');
-define('BANLAN_117', 'Spare reason');
-define('BANLAN_118', 'Spare reason');
-define('BANLAN_119', 'Indicates an import error - previously imported bans');
+// define('BANLAN_110', 'Most likely a ban that was imposed before e107 was upgraded to 0.8');
+// define('BANLAN_111', 'Entered by an admin');
+// define('BANLAN_112', 'Attempts to update the site too fast');
+// define('BANLAN_113', 'Attempts to access the site too frequently from the same address');
+// define('BANLAN_114', 'Multiple failed login attempts from the same user');
+// define('BANLAN_115', 'Added from an external list');
+// define('BANLAN_116', 'IP address banned on account of user ban');
+// define('BANLAN_117', 'Spare reason');
+// define('BANLAN_118', 'Spare reason');
+// define('BANLAN_119', 'Indicates an import error - previously imported bans');

-define('BANLAN_120', 'Unknown');
+// define('BANLAN_120', 'Unknown');

 ?>
--- a/e107_languages/English/admin/lan_cpage.php
+++ b/e107_languages/English/admin/lan_cpage.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_cpage.php,v 1.7 2009-08-05 14:22:15 e107coders Exp $
+ * $Id: lan_cpage.php,v 1.8 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 *
@@ -15,7 +15,7 @@ define("CUSLAN_7", "Menu Name");
 define("CUSLAN_8", "Title / Caption");
 define("CUSLAN_9", "Text");
 define("CUSLAN_10", "Allow page to be rated");
-define("CUSLAN_11", "Front page");
+// define("CUSLAN_11", "Front page");
 define("CUSLAN_12", "Create page");
 define("CUSLAN_13", "Allow comments");
 define("CUSLAN_14", "Password protect page");
@@ -36,14 +36,14 @@ define("CUSLAN_28", "Page deleted");
 define("CUSLAN_29", "List pages if no page selected");
 define("CUSLAN_30", "Expiry time for cookie (in seconds)");
 define("CUSLAN_31", "Create menu");
-define("CUSLAN_32", "Convert old pages/menus");
+// define("CUSLAN_32", "Convert old pages/menus");
 define("CUSLAN_33", "Page Options");
-define("CUSLAN_34", "Beginning conversion");
-define("CUSLAN_35", "Finished custom page update - updated");
-define("CUSLAN_36", "To set your preferences for each page, please return to front page and edit the pages.");
-define("CUSLAN_37", "Custom Page Update");
-define("CUSLAN_38", "on");
-define("CUSLAN_39", "off");
+//define("CUSLAN_34", "Beginning conversion");
+//define("CUSLAN_35", "Finished custom page update - updated");
+//define("CUSLAN_36", "To set your preferences for each page, please return to front page and edit the pages.");
+//define("CUSLAN_37", "Custom Page Update");
+//define("CUSLAN_38", "on");
+//define("CUSLAN_39", "off");
 define("CUSLAN_40", "Save Options");

 define("CUSLAN_41", "Display author and date information");
--- a/e107_languages/English/admin/lan_credits.php
+++ b/e107_languages/English/admin/lan_credits.php
@@ -4,22 +4,22 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_credits.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2009-11-08 09:14:39 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */

 define("PAGE_NAME", "e107 Credits");

-define("CRELAN_1", "Credits");
+// define("CRELAN_1", "Credits");
 define("CRELAN_2", "Here is a list of third-party software / resources used in e107. The e107 development team would like to personally thank the developers of the following for allowing us to redistribute their code with e107, and for releasing their software under the GPL licence.");
 define("CRELAN_3", "all rights reserved");
 define("CRELAN_4", "Show e107 Dev Team");
 define("CRELAN_5", "Show third party scripts");
 define("CRELAN_6", "e107 v0.7 was brought to you by ...");
 define("CRELAN_7", "version");
-define("CRELAN_8", "permission granted");
+// define("CRELAN_8", "permission granted");
 define("CRELAN_9", "Licence");

 // third party scripts
@@ -47,7 +47,7 @@ define("CRELAN_24", ""); // McFly
 define("CRELAN_25", ""); // que
 define("CRELAN_26", ""); // streaky
 define("CRELAN_27", "\"Wot? No tea?? 0_0\""); // SweetAs
-define("CRELAN_28", ""); // MrPete
+

 // end dev team

--- a/e107_languages/English/admin/lan_cron.php
+++ b/e107_languages/English/admin/lan_cron.php
@@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_cron.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-10-23 14:16:08 $
+|     $Revision: 1.3 $
+|     $Date: 2009-11-08 09:14:39 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -19,8 +19,8 @@ define("LAN_CRON_5", "Day(s)");
 define("LAN_CRON_6", "Month(s)");
 define("LAN_CRON_7", "Weekday(s)");
 define("LAN_CRON_8", "Active");
-define("LAN_CRON_9", "Description");
-define("LAN_CRON_10", "Description");
+// define("LAN_CRON_9", "Description");
+// define("LAN_CRON_10", "Description");

 define("LAN_CRON_11", "Every Minute");
 define("LAN_CRON_12", "Every Other Minute");
--- a/e107_languages/English/admin/lan_db.php
+++ b/e107_languages/English/admin/lan_db.php
@@ -1,14 +1,14 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_db.php,v 1.7 2009-08-27 21:01:44 e107coders Exp $
+ * $Id: lan_db.php,v 1.8 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 *
 */
 define("DBLAN_1", "Core settings backed up in database.");
-define("DBLAN_2", "Select to save a backup of your e107 database");
-define("DBLAN_3", "Backup SQL database");
+// define("DBLAN_2", "Select to save a backup of your e107 database");
+// define("DBLAN_3", "Backup SQL database");
 define("DBLAN_4", "Select to check validity of e107 database");
 define("DBLAN_5", "Check database validity");
 define("DBLAN_6", "Select to optimize your e107 database");
@@ -18,15 +18,15 @@ define("DBLAN_9", "Backup core");
 define("DBLAN_10", "Database Utilities");
 define("DBLAN_11", "MySQL database");
 define("DBLAN_12", "optimized");
-define("DBLAN_13", "Back");
-define("DBLAN_14", "Done");
+// define("DBLAN_13", "Back");
+// define("DBLAN_14", "Done");
 define("DBLAN_15", "Select to check for any available db updates");
 define("DBLAN_16", "Check for Updates");
 define("DBLAN_17", "Pref. Name");
 define("DBLAN_18", "Pref. Value");
 define("DBLAN_19", "Select to open the preferences editor (for advanced users only)");
 define("DBLAN_20", "Preferences Editor");
-define("DBLAN_21", "Delete Checked");
+// define("DBLAN_21", "Delete Checked");
 define("DBLAN_22", "Plugin View and Scan");
 define("DBLAN_23", "Scan Completed");
 define("DBLAN_24", "Name");
@@ -50,11 +50,11 @@ define("DBLAN_40", "Record Validation : ");
 define("DBLAN_41", "table");
 define("DBLAN_42", "id");
 define("DBLAN_43", "remark");
-define("DBLAN_44", "options");
+// define("DBLAN_44", "options");
 define("DBLAN_45", "Id Not Found!");
 define("DBLAN_46", "Table Not Found!");
-define("DBLAN_47", "delete");
-define("DBLAN_48", "Delete Checked");
+// define("DBLAN_47", "delete");
+// define("DBLAN_48", "Delete Checked");
 define("DBLAN_49", "No records present in the table, so nothing to validate");
 define("DBLAN_50", "Sql Record Validation");

--- a/e107_languages/English/admin/lan_db_verify.php
+++ b/e107_languages/English/admin/lan_db_verify.php
@@ -4,13 +4,13 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_db_verify.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-30 13:51:41 $
-|     $Author: secretr $
+|     $Revision: 1.4 $
+|     $Date: 2009-11-08 09:14:39 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("DBLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/admin/sql</b> directory.");
-define("DBLAN_2", "Verifying all");
+// define("DBLAN_2", "Verifying all");

 define("DBLAN_4", "Table");
 define("DBLAN_5", "Field");
--- a/e107_languages/English/admin/lan_e107_update.php
+++ b/e107_languages/English/admin/lan_e107_update.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_e107_update.php,v 1.9 2009-11-07 11:20:34 e107coders Exp $
+ * $Id: lan_e107_update.php,v 1.10 2009-11-08 09:14:39 e107coders Exp $
 *
 * Administration Language File
 *
@@ -34,7 +34,7 @@ define('LAN_UPDATE_27',	'Adding Table: ');

 // define('LAN_UPDATE_35', 'Error modifying data in comment table');
 // define('LAN_UPDATE_36', 'Error deleting old field in comment table');
-// define('LAN_UPDATE_37', 'Add index --INDEX-- to table --TABLE--');
+define('LAN_UPDATE_37', 'Add index --INDEX-- to table --TABLE--');
 define('LAN_UPDATE_38', 'Update front page settings');
 // define('LAN_UPDATE_39', 'Update linkwords table');
 define('LAN_UPDATE_40', 'Update newsfeeds table');
@@ -49,11 +49,11 @@ define('LAN_UPDATE_50', 'Obsolete prefs deleted: ');
 define('LAN_UPDATE_51', 'Update plugin table definition: ');
 define('LAN_UPDATE_52', 'Update downloads table');
 define('LAN_UPDATE_53', 'Update download mirror table');
-// define('LAN_UPDATE_54', 'Missing table --TABLE-- - cannot add index --INDEX--');
+define('LAN_UPDATE_54', 'Missing table --TABLE-- - cannot add index --INDEX--');
 define('LAN_UPDATE_55', 'Description');
-// define('LAN_UPDATE_56', 'System Update');
+define('LAN_UPDATE_56', 'System Update');

-define('LAN_UPDATE_CAPTION_PLUGIN', 'Plugin Updates');
-define('LAN_UPDATE_CAPTION_CORE', 'Core Updates');
+// define('LAN_UPDATE_CAPTION_PLUGIN', 'Plugin Updates'); // Unused
+// define('LAN_UPDATE_CAPTION_CORE', 'Core Updates'); // Unused

 ?>
--- a/e107_languages/English/admin/lan_emoticon.php
+++ b/e107_languages/English/admin/lan_emoticon.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_emoticon.php,v 1.6 2008-12-15 11:35:33 secretr Exp $
+ * $Id: lan_emoticon.php,v 1.7 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 *
@@ -32,11 +32,11 @@ define("EMOLAN_18", "Please rename the instances listed below so they no longer
 define("EMOLAN_19", "Name");
 define("EMOLAN_20", "Location");
 define("EMOLAN_21", "Read Pack Error");
-//define("EMOLAN_2", "Name");
+
 define("EMOLAN_22", "New emote pack found:");
 define("EMOLAN_23", "New emote xml pack found:");
 define("EMOLAN_24", "New emote php pack found:");
-//define("EMOLAN_25", "Installing new PHP emotes: ");
+define("EMOLAN_25", "Installing new PHP emotes: ");
 define("EMOLAN_26", "Re-scan pack");
 define("EMOLAN_27", "Error occurred processing pack: ");
 define("EMOLAN_28", "Generate XML");
--- a/e107_languages/English/admin/lan_filemanager.php
+++ b/e107_languages/English/admin/lan_filemanager.php
@@ -4,15 +4,15 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_filemanager.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2009-11-08 09:14:39 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
-define("FMLAN_1", "Uploaded");
-define("FMLAN_2", "to");
-define("FMLAN_3", "directory");
-define("FMLAN_4", "The uploaded file exceeds the upload_max_filesize directive in php.ini.");
+// define("FMLAN_1", "Uploaded");
+// define("FMLAN_2", "to");
+// define("FMLAN_3", "directory");
+// define("FMLAN_4", "The uploaded file exceeds the upload_max_filesize directive in php.ini.");
 // define("FMLAN_5", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form.");
 // define("FMLAN_6", "The uploaded file was only partially uploaded.");
 // define("FMLAN_7", "No file was uploaded.");
@@ -40,12 +40,12 @@ define("FMLAN_30", "Up level");
 define("FMLAN_31", "folder");

 define("FMLAN_32", "Select Directory");
-define("FMLAN_33", "Select");
+// define("FMLAN_33", "Select");
 define("FMLAN_34", "Directory Choice");
 define("FMLAN_35", "Files Directory");

-define("FMLAN_36", "Custom Menus Directory");
-define("FMLAN_37", "Custom Pages Directory");
+// define("FMLAN_36", "Custom Menus Directory");
+// define("FMLAN_37", "Custom Pages Directory");

 define("FMLAN_38", "Successfully moved file to");
 define("FMLAN_39", "Unable to move file to");
--- a/e107_languages/English/admin/lan_fla.php
+++ b/e107_languages/English/admin/lan_fla.php
@@ -4,29 +4,29 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_fla.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-23 16:25:06 $
-|     $Author: secretr $
+|     $Revision: 1.4 $
+|     $Date: 2009-11-08 09:14:39 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
-define("FLALAN_1", "Failed login attempts");
+// define("FLALAN_1", "Failed login attempts");
 define("FLALAN_2", "No failed login attempts have been logged");
 define("FLALAN_3", "Attempt(s) deleted");
 define("FLALAN_4", "User attempted to login using incorrect username/password");
 define("FLALAN_5", "IP(s) banned");
-define("FLALAN_6", "Date");
+// define("FLALAN_6", "Date");
 define("FLALAN_7", "Data");
 define("FLALAN_8", "IP address/ Host");
-define("FLALAN_9", "Options");
+// define("FLALAN_9", "Options");
 define("FLALAN_10", "Delete / Ban checked entries");
-define("FLALAN_11", "check all delete checkboxes");
-define("FLALAN_12", "uncheck all delete checkboxes");
-define("FLALAN_13", "check all ban checkboxes");
-define("FLALAN_14", "uncheck all ban checkboxes");
+// define("FLALAN_11", "check all delete checkboxes");
+// define("FLALAN_12", "uncheck all delete checkboxes");
+// define("FLALAN_13", "check all ban checkboxes");
+// define("FLALAN_14", "uncheck all ban checkboxes");
 define("FLALAN_15", "The following IP address(es) have been auto-banned - user attempted more than ten failed logins");
 define("FLALAN_16", "delete this auto ban list");
 define("FLALAN_17", "Auto-ban list deleted");
 define('FLALAN_18', "Could not ban IP address --IP-- - on whitelist");

-define('FLALAN_19', "Check All Delete");
+// define('FLALAN_19', "Check All Delete");
 ?>
--- a/e107_languages/English/admin/lan_frontpage.php
+++ b/e107_languages/English/admin/lan_frontpage.php
@@ -1,30 +1,12 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_frontpage.php,v 1.5 2008-12-21 10:58:35 secretr Exp $
+ * $Id: lan_frontpage.php,v 1.6 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 *
 */

-/*
-define("FRTLAN_2", "Set front page for");
-define("FRTLAN_6", "Links");
-define("FRTLAN_16", "error: no content main parent selected");
-define("FRTLAN_17", "error: no content sub category selected");
-define("FRTLAN_18", "error: no content item selected");
-define("FRTLAN_19", "content main parent");
-define("FRTLAN_20", "content category");
-define("FRTLAN_21", "content item");
-
-define("FRTLAN_26", "all users");
-define("FRTLAN_27", "Guests");
-define("FRTLAN_28", "Members");
-define("FRTLAN_29", "Administrators");
-define("FRTLAN_31", "All Users");
-define("FRTLAN_32", "User Class");
-define("FRTLAN_34", "Page");
-*/

 define("FRTLAN_1", "Front Page settings updated.");
 define("FRTLAN_12", "Update Front Page Settings");
@@ -42,7 +24,7 @@ define('FRTLAN_35', 'Post-login page');
 define('FRTLAN_40', 'Order');
 define('FRTLAN_42', 'Add new rule');
 define('FRTLAN_43', 'Class: ');
-define('FRTLAN_44', 'Go to this page after login');
+// define('FRTLAN_44', 'Go to this page after login');
 define('FRTLAN_45', 'Values not changed');
 define('FRTLAN_46', 'Edit existing rule');
 define('FRTLAN_47', 'Move up');
--- a/e107_languages/English/admin/lan_image.php
+++ b/e107_languages/English/admin/lan_image.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_image.php,v 1.9 2009-07-16 08:15:35 e107coders Exp $
+ * $Id: lan_image.php,v 1.10 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 * 
@@ -22,10 +22,10 @@ define("IMALAN_12", "Disabled image method");
 define("IMALAN_13", "What to do with images if image display is disabled");
 define("IMALAN_14", "Show image URL");
 define("IMALAN_15", "Show nothing");
-define("IMALAN_16", "Show uploaded avatars");
-define("IMALAN_17", "Click here");
+// define("IMALAN_16", "Show uploaded avatars");
+// define("IMALAN_17", "Click here");
 define("IMALAN_18", "Uploaded Avatar Images");
-define("IMALAN_19", "Show 'disabled' message");
+// define("IMALAN_19", "Show 'disabled' message");
 define('IMALAN_20', 'Nothing changed');
 define("IMALAN_21", "Used by");
 define("IMALAN_22", "Image not in use");
@@ -36,10 +36,10 @@ define("IMALAN_26", "image(s) deleted");

 define("IMALAN_28", "deleted");
 define("IMALAN_29", "No images");
-define("IMALAN_30", "Everyone (public)");
-define("IMALAN_31", "Guests only");
-define("IMALAN_32", "Members only");
-define("IMALAN_33", "Admin only");
+// define("IMALAN_30", "Everyone (public)");
+// define("IMALAN_31", "Guests only");
+// define("IMALAN_32", "Members only");
+// define("IMALAN_33", "Admin only");
 define("IMALAN_34", "Enable PNG Fix");
 define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)");

@@ -50,8 +50,8 @@ define("IMALAN_39", "Maximum allowable height");
 define("IMALAN_40", "Too wide");
 define("IMALAN_41", "Too high");
 define("IMALAN_42", "Not found");
-define("IMALAN_43", "Delete uploaded avatar");
-define("IMALAN_44", "Delete external reference");
+// define("IMALAN_43", "Delete uploaded avatar");
+// define("IMALAN_44", "Delete external reference");
 define("IMALAN_45", "Not found");
 define("IMALAN_46", "Too large");
 define("IMALAN_47", "Total uploaded avatars");
@@ -70,20 +70,14 @@ define('IMALAN_55', 'Not installed');
 //uploaded avatar list
 define('IMALAN_56', 'Click to select');
 define('IMALAN_57', 'Image too big - click to enlarge');
-define('IMALAN_58', 'Delete checked');
-define('IMALAN_59', 'Check All');
-define('IMALAN_60', 'Uncheck All');
-

 //avatar check
 // define('IMALAN_61', 'Options');
 define('IMALAN_62', 'Reason');
-define('IMALAN_63', 'URL');
-define('IMALAN_64', 'User');
+
 define('IMALAN_65', 'Nothing found');

 define('IMALAN_66', 'Filename');
-define('IMALAN_67', 'Are you sure?');
 define('IMALAN_68', 'Close');
 define('IMALAN_69', 'Folder');
 define('IMALAN_70', 'Non-system folder is found!');
--- a/e107_languages/English/admin/lan_lancheck.php
+++ b/e107_languages/English/admin/lan_lancheck.php
@@ -1,31 +1,31 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_lancheck.php,v 1.6 2009-11-05 08:07:53 e107coders Exp $
+ * $Id: lan_lancheck.php,v 1.7 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 * 
 */
 define("LAN_CHECK_1", "Verify/Edit Language-Pack Files"); // modified in 0.7.6
-define("LAN_CHECK_2", "Verify");
+// define("LAN_CHECK_2", "Verify");
 define("LAN_CHECK_3", "Verification of");
 define("LAN_CHECK_4", "File missing!");
 define("LAN_CHECK_5", "Phrase missing!");

-define("LAN_CHECK_7", "phrase");
+// define("LAN_CHECK_7", "phrase");

-define("LAN_CHECK_8", "A file is missing...");
-define("LAN_CHECK_9", " files are missing...");
-define("LAN_CHECK_10", "Critical error: ");
-define("LAN_CHECK_11", "No files missing !");
-define("LAN_CHECK_12", "A file is wrong...");
-define("LAN_CHECK_13", " files are wrong...");
-define("LAN_CHECK_14", "All existing files are valid !");
+// define("LAN_CHECK_8", "A file is missing...");
+// define("LAN_CHECK_9", " files are missing...");
+// define("LAN_CHECK_10", "Critical error: ");
+// define("LAN_CHECK_11", "No files missing !");
+// define("LAN_CHECK_12", "A file is wrong...");
+// define("LAN_CHECK_13", " files are wrong...");
+// define("LAN_CHECK_14", "All existing files are valid !");

 define("LAN_CHECK_15", "Illegal characters found before '&lt;?php'");
 define("LAN_CHECK_16", "Original File");
 define("LAN_CHECK_17", "A write problem occured while trying to save the file.");
-define("LAN_CHECK_18", "Language files in the standard format are NOT available for this plugin/theme.");
+// define("LAN_CHECK_18", "Language files in the standard format are NOT available for this plugin/theme.");
 define("LAN_CHECK_19", "Non-UTF-8 characters found!");
 define('LAN_CHECK_20', 'File');
 define('LAN_CHECK_21', 'Theme');
--- a/e107_languages/English/admin/lan_language.php
+++ b/e107_languages/English/admin/lan_language.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_language.php,v 1.8 2009-11-05 08:07:53 e107coders Exp $
+ * $Id: lan_language.php,v 1.9 2009-11-08 09:14:39 e107coders Exp $
 *
 * Admin Language File
 *
@@ -16,7 +16,7 @@ define("LANG_LAN_05","Not Installed");
 define("LANG_LAN_06", "Create tables");
 define("LANG_LAN_07", "Drop existing tables?");
 define("LANG_LAN_08", "Replace existing tables (data will be lost).");
-define("LANG_LAN_10", "Confirm delete");
+// define("LANG_LAN_10", "Confirm delete");
 define("LANG_LAN_11", "Delete unchecked tables above (if they exist).");
 define("LANG_LAN_12", "Enable Multi-Language Tables");
 define("LANG_LAN_13", "Language Preferences");
@@ -41,11 +41,11 @@ define('LANG_LAN_PAGE_TITLE', 'Languages');
 define('LANG_LAN_28', '%s deleted.');
 define('LANG_LAN_29', '%s couldn\'t be deleted.');
 define('LANG_LAN_30', '%s created.');
-define('LANG_LAN_31', '%s couldn\'t be deleted.');
+// define('LANG_LAN_31', '%s couldn\'t be deleted.');
 define('LANG_LAN_32', '%s was disabled but left intact.');
 define('LANG_LAN_33', 'Delete all tables in %s?');

-define('LANG_LAN_09', 'Are you sure?');
+// define('LANG_LAN_09', 'Are you sure?');
 define('LANG_LAN_34', 'Available Language Packs');
 define('LANG_LAN_35', "The following language packs are available for this version of e107.");
 define('LANG_LAN_36', "Language-Pack errors found! Please first verify your language files are without errors, before creating a language-pack.");