diff --git a/banner.php b/banner.php
index cd6772554..b92196cc2 100644
--- a/banner.php
+++ b/banner.php
@@ -9,12 +9,14 @@
  * 
  *
  * $Source: /cvs_backup/e107_0.8/banner.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-07-18 17:03:39 $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-28 15:30:25 $
  * $Author: marj_nl_fr $
  */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."form_handler.php");
 $rs = new form;
 	
diff --git a/comment.php b/comment.php
index 083b4a2e3..01e8274a6 100644
--- a/comment.php
+++ b/comment.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/comment.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.11 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."news_class.php");
 require_once(e_HANDLER."comment_class.php");
 define("PAGE_NAME", COMLAN_99);
diff --git a/contact.php b/contact.php
index f4a27c238..14a18db69 100644
--- a/contact.php
+++ b/contact.php
@@ -11,16 +11,18 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/contact.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2009-07-27 21:12:42 $
-|     $Author: bugrain $
+|     $Revision: 1.8 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
 
-    // security image may be disabled by removing the appropriate shortcodes from the template.
-	require_once(e_HANDLER."secure_img_handler.php");
-	$sec_img = new secure_image;
+// security image may be disabled by removing the appropriate shortcodes from the template.
+require_once(e_HANDLER."secure_img_handler.php");
+$sec_img = new secure_image;
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 
 require_once(HEADERF);
diff --git a/download.php b/download.php
index e1404c608..37d4a1f2f 100644
--- a/download.php
+++ b/download.php
@@ -11,14 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/download.php,v $
-|     $Revision: 1.28 $ 
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.29 $ 
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."comment_class.php");
 require_once(e_FILE."shortcode/batch/download_shortcodes.php");
 
diff --git a/email.php b/email.php
index 7b1972c64..559ac5035 100644
--- a/email.php
+++ b/email.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/email.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.6 $
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(HEADERF);
 
 $use_imagecode = FALSE;
diff --git a/error.php b/error.php
index 43692b713..ba25f2331 100644
--- a/error.php
+++ b/error.php
@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/error.php,v $
-|     $Revision: 1.9 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.10 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 define("ERR_PAGE_ACTIVE",'error');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once("class2.php");
 
diff --git a/fpw.php b/fpw.php
index a03574247..6ec16065c 100644
--- a/fpw.php
+++ b/fpw.php
@@ -11,12 +11,13 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/fpw.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if(USER)
 {
diff --git a/login.php b/login.php
index 4550312cf..275a24c1b 100644
--- a/login.php
+++ b/login.php
@@ -11,13 +11,15 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/login.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 if (USER)
 {
 	header('location:'.e_BASE.'index.php');      
diff --git a/membersonly.php b/membersonly.php
index 7af2a85e8..87ffaeb1b 100644
--- a/membersonly.php
+++ b/membersonly.php
@@ -11,14 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/membersonly.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.4 $
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_membersonly.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if(is_readable(THEME."membersonly_template.php"))
 {
diff --git a/news.php b/news.php
index 9a5985b89..95df997b6 100644
--- a/news.php
+++ b/news.php
@@ -9,12 +9,14 @@
  * News frontend
  *
  * $Source: /cvs_backup/e107_0.8/news.php,v $
- * $Revision: 1.16 $
- * $Date: 2009-07-10 20:30:09 $
- * $Author: e107steved $
+ * $Revision: 1.17 $
+ * $Date: 2009-08-28 15:30:24 $
+ * $Author: marj_nl_fr $
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."news_class.php");
 require_once(e_HANDLER."comment_class.php");
 $cobj = new comment;
diff --git a/online.php b/online.php
index 894562d7c..36abd81af 100644
--- a/online.php
+++ b/online.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/online.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(HEADERF);
 
 if (!$pref['track_online'])
diff --git a/page.php b/page.php
index 93f108fab..bceb8fe8d 100644
--- a/page.php
+++ b/page.php
@@ -11,14 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/page.php,v $
-|     $Revision: 1.20 $
-|     $Date: 2009-08-23 10:57:50 $
+|     $Revision: 1.21 $
+|     $Date: 2009-08-28 15:30:24 $
 |     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 $page = new pageClass();
 if(isset($_POST['enterpw']))
 {
diff --git a/print.php b/print.php
index 34886dfa4..84544c027 100644
--- a/print.php
+++ b/print.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/print.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.11 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 $HEADER="";
 $FOOTER="";
 $CUSTOMHEADER = "";
diff --git a/rate.php b/rate.php
index f2e72fee9..28442da82 100644
--- a/rate.php
+++ b/rate.php
@@ -11,15 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/rate.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.4 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 // DIRTY - needs input validation, streaky
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 $qs = explode("^", e_QUERY);
 
diff --git a/search.php b/search.php
index 2e712712b..fe39e9dd5 100644
--- a/search.php
+++ b/search.php
@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/search.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.13 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if (!check_class($pref['search_restrict'])) {
 	require_once(HEADERF);
diff --git a/signup.php b/signup.php
index 85c3af4d7..a24374ac6 100644
--- a/signup.php
+++ b/signup.php
@@ -9,20 +9,23 @@
  * User signup
  *
  * $Source: /cvs_backup/e107_0.8/signup.php,v $
- * $Revision: 1.38 $
- * $Date: 2009-08-09 08:39:27 $
+ * $Revision: 1.39 $
+ * $Date: 2009-08-28 15:30:25 $
  * $Author: marj_nl_fr $
  *
 */
 
 
 require_once("class2.php");
+
 $qs = explode(".", e_QUERY);
+
 if($qs[0] != 'activate')
 {   // multi-language fix.
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 //	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_usersettings.php");		Shouldn't need this now
 }
+
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php');		// Generic user-related language defines
 
 define('SIGNUP_DEBUG', FALSE);
@@ -36,11 +39,11 @@ require_once(e_HANDLER.'user_handler.php');
 $userMethods = new UserHandler;
 $userMethods->deleteExpired();				// Delete time-expired partial registrations
 
-if (is_readable(THEME."signup_template.php")) 
+if (is_readable(THEME."signup_template.php"))
 {
 	require_once(THEME."signup_template.php");
-} 
-else 
+}
+else
 {
 	require_once(e_THEME."templates/signup_template.php");
 }
@@ -54,11 +57,11 @@ $error = FALSE;
 
 
 //-------------------------------
-// Resend Activation Email 
+// Resend Activation Email
 //-------------------------------
 if(e_QUERY == "resend" && !USER && ($pref['user_reg_veri'] == 1))
 {
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_".e_PAGE);
+// done above:	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 	require_once(HEADERF);
 
 	$clean_email = $tp -> toDB($_POST['resend_email']);
@@ -96,7 +99,7 @@ if(e_QUERY == "resend" && !USER && ($pref['user_reg_veri'] == 1))
 		}
 		$row = $sql -> db_Fetch();
 		// We should have a user record here
-	
+
 		if(trim($_POST['resend_password']) !="" && $new_email)
 		{  // Need to change the email address - check password to make sure
 			if ($userMethods->CheckPassword($_POST['resend_password'], $row['user_loginname'], $row['user_password']) === TRUE)
@@ -113,7 +116,7 @@ if(e_QUERY == "resend" && !USER && ($pref['user_reg_veri'] == 1))
 				exit;
 			}
 		}
-	
+
 		// Now send the email - got some valid info
 		$row['user_password'] = 'xxxxxxx';		// Don't know the real one
 		$eml = render_email($row);
@@ -202,7 +205,7 @@ if(!$_POST)
 
 if(ADMIN && (e_QUERY == "preview" || e_QUERY == "test"  || e_QUERY == "preview.aftersignup"))
 {
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_".e_PAGE);
+// done above:	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 	if(e_QUERY == "preview.aftersignup")
 	{
 		require_once(HEADERF);
@@ -277,31 +280,32 @@ if(USER)
 }
 
 //----------------------------------------
-// After clicking the activation link 
+// After clicking the activation link
 //----------------------------------------
 if (e_QUERY)
 {
 	$qs = explode(".", e_QUERY);
 	if ($qs[0] == "activate" && (count($qs) == 3 || count($qs) == 4) && $qs[2])
 	{
-        // return the message in the correct language.
+		//TODO use generic multilanguage selection
+		// return the message in the correct language.
 		if(isset($qs[3]) && strlen($qs[3]) == 2 )
 		{
 			require_once(e_HANDLER."language_class.php");
 			$slng = new language;
 			$the_language = $slng->convert($qs[3]);
-			if(is_readable(e_LANGUAGEDIR.$the_language."/lan_signup.php"))
+			if(is_readable(e_LANGUAGEDIR.$the_language.'/lan_'.e_PAGE))
 			{
-				include(e_LANGUAGEDIR.$the_language."/lan_signup.php");
+				include(e_LANGUAGEDIR.$the_language.'/lan_'.e_PAGE);
 			}
 			else
 			{
-				require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
- 			}
+				include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+			}
 		}
 		else
 		{
-            include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+				include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 		}
 
 
@@ -399,7 +403,7 @@ if (isset($_POST['register']))
 				$xup[$value] = $match[2][$count];
 				$count++;
 			}
-	
+
 			$_POST['name'] = $xup['NICKNAME'];
 			$_POST['email'] = $xup['EMAIL'];
 			$_POST['email_confirm'] = $xup['EMAIL'];
@@ -407,7 +411,7 @@ if (isset($_POST['register']))
 			$_POST['hideemail'] = $xup['EMAILHIDE'];
 			$_POST['realname'] = $xup['FN'];
 			$_POST['image'] = $xup['AV'];
-	
+
 			$_POST['ue']['user_timezone'] = $xup['TZ'];
 			$_POST['ue']['user_homepage'] = $xup['URL'];
 			$_POST['ue']['user_icq'] = $xup['ICQ'];
@@ -416,7 +420,7 @@ if (isset($_POST['register']))
 			$_POST['ue']['user_yahoo'] = $xup['YAHOO'];
 			$_POST['ue']['user_location'] = $xup['GEO'];
 			$_POST['ue']['user_birthday'] = $xup['BDAY'];
-	
+
 			unset($xup);
 			if($_POST['loginnamexup']) $_POST['loginname'] = $_POST['loginnamexup'];
 			if($_POST['password1xup']) $_POST['password1'] = $_POST['password1xup'];
@@ -430,13 +434,13 @@ if (isset($_POST['register']))
 		{
 		  $_POST['loginname'] = $userMethods->generateUserLogin($pref['predefinedLoginName']);
 		}
-	
+
 		// Use LoginName for DisplayName if restricted
 		if (!check_class($pref['displayname_class'],e_UC_PUBLIC.','.e_UC_MEMBER))
 		{
 			$_POST['username'] = $_POST['loginname'];
 		}
-	
+
 		// Now validate everything
 		$allData = validatorClass::validateFields($_POST,$userMethods->userVettingInfo, TRUE);		// Do basic validation
 		validatorClass::checkMandatory('user_name,user_loginname', $allData);						// Check for missing fields (email done in userValidation() )
@@ -449,10 +453,10 @@ if (isset($_POST['register']))
 		}
 		unset($_POST['password1']);					// Restrict the scope of this
 		unset($_POST['password2']);
-	
+
 		$allData['user_ip'] = $e107->getip();
-	
-	
+
+
 		// check for multiple signups from the same IP address.
 		if($ipcount = $sql->db_Select('user', '*', "user_ip='".$allData['user_ip']."' and user_ban !='2' "))
 		{
@@ -462,7 +466,7 @@ if (isset($_POST['register']))
 				$allData['errortext']['user_email'] =  LAN_SIGNUP_71;
 			}
 		}
-	
+
 		// Email address confirmation.
 		if (!isset($allData['errors']['user_email']))
 		{	// Obviously nothing wrong with the email address so far (or maybe its not required)
@@ -473,12 +477,12 @@ if (isset($_POST['register']))
 				unset($allData['data']['user_email']);
 			}
 		}
-	
-	
+
+
 		// Verify Custom Signup options if selected - need specific loop since the need for them is configuration-dependent
 		$signup_option_title = array(LAN_USER_63, LAN_USER_71, LAN_USER_72, LAN_USER_73, LAN_USER_74);
 		$signup_option_names = array('realname', 'signature', 'image', 'class', 'customtitle');
-	
+
 		foreach($signup_option_names as $key => $value)
 		{
 			if ($pref['signup_option_'.$value] == 2 && !isset($alldata['data']['user_'.$value]) && !isset($alldata['errors']['user_'.$value]))
@@ -487,8 +491,8 @@ if (isset($_POST['register']))
 				$alldata['errortext']['user_'.$value] = str_replace('--SOMETHING--',$signup_option_title[$key],LAN_USER_75);
 			}
 		}
-	
-	
+
+
 		// Validate Extended User Fields.
 		$eufVals = array();
 		if (isset($_POST['ue']))
@@ -539,7 +543,7 @@ if (isset($_POST['register']))
 			exit;
 		}
 
-		if ($_POST['email'] && $sql->db_Select("user", "*", "user_email='".$_POST['email']."' AND user_ban='".USER_BANNED."'")) 
+		if ($_POST['email'] && $sql->db_Select("user", "*", "user_email='".$_POST['email']."' AND user_ban='".USER_BANNED."'"))
 		{
 			exit;
 		}
diff --git a/sitedown.php b/sitedown.php
index d5f763050..5e1ab8869 100644
--- a/sitedown.php
+++ b/sitedown.php
@@ -11,19 +11,21 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/sitedown.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.3 $
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
+/*
 global $pref;
 global $tp;
 
 e107_include_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_sitedown.php");
 e107_include_once(e_LANGUAGEDIR."English/lan_sitedown.php");
-
+*/
 if (!$pref['maintainance_flag'] )
 {
 	header("location: ".SITEURL);
diff --git a/submitnews.php b/submitnews.php
index 89fd8706d..561412cc9 100644
--- a/submitnews.php
+++ b/submitnews.php
@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/submitnews.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2009-08-17 19:26:17 $
-|     $Author: e107steved $
+|     $Revision: 1.13 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once(HEADERF);
 
diff --git a/top.php b/top.php
index 95b3a23f8..daef81597 100644
--- a/top.php
+++ b/top.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/top.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-07-14 05:31:57 $
-|     $Author: e107coders $
+|     $Revision: 1.5 $
+|     $Date: 2009-08-28 15:30:25 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once ('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 if (!e_QUERY)
 {
 	$action = 'top';
diff --git a/upload.php b/upload.php
index 081d10ff0..380d5b746 100644
--- a/upload.php
+++ b/upload.php
@@ -11,12 +11,13 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/upload.php,v $
-|     $Revision: 1.9 $
-|     $Date: 2009-07-22 19:18:13 $
-|     $Author: e107steved $
+|     $Revision: 1.10 $
+|     $Date: 2009-08-28 15:30:24 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if (!$pref['upload_enabled'] || $pref['upload_class'] == 255) 
 {
diff --git a/user.php b/user.php
index bc4737f0e..400d8cb97 100644
--- a/user.php
+++ b/user.php
@@ -9,14 +9,15 @@
  * User information
  *
  * $Source: /cvs_backup/e107_0.8/user.php,v $
- * $Revision: 1.8 $
- * $Date: 2008-12-20 20:18:54 $
- * $Author: e107steved $
+ * $Revision: 1.9 $
+ * $Date: 2009-08-28 15:30:24 $
+ * $Author: marj_nl_fr $
  *
 */
-define('PAGE_NAME', 'Members');
+//HCL define('PAGE_NAME', 'Members');
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 // Next bit is to fool PM plugin into doing things
 global $user;
diff --git a/userposts.php b/userposts.php
index 736dc5ada..8194a7920 100644
--- a/userposts.php
+++ b/userposts.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/userposts.php,v $
-|     $Revision: 1.11 $
-|     $Date: 2009-08-23 10:57:50 $
+|     $Revision: 1.12 $
+|     $Date: 2009-08-28 15:30:24 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER.'comment_class.php');
 $cobj = new comment;
 require_once(HEADERF);
diff --git a/usersettings.php b/usersettings.php
index 33d2a3780..e82a02ec9 100644
--- a/usersettings.php
+++ b/usersettings.php
@@ -9,9 +9,9 @@
  * User settings modify
  *
  * $Source: /cvs_backup/e107_0.8/usersettings.php,v $
- * $Revision: 1.38 $
- * $Date: 2009-08-05 22:03:23 $
- * $Author: e107coders $
+ * $Revision: 1.39 $
+ * $Date: 2009-08-28 15:30:24 $
+ * $Author: marj_nl_fr $
  *
 */
 /*
@@ -26,6 +26,7 @@ if(is_numeric($_SERVER["QUERY_STRING"]))
 	$eplug_admin = TRUE;
 }
 require_once ('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 define("US_DEBUG",FALSE);
 //define('US_DEBUG', false);