diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 0a9be9f54..7456d3170 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2009-08-05 14:20:39 $
-|     $Author: e107coders $
+|     $Revision: 1.13 $
+|     $Date: 2009-08-28 16:11:01 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
+// done in class2 for now: include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'main';
 require_once('auth.php');
 require_once(e_HANDLER.'admin_handler.php');
diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 5e26f75e1..b418af9b3 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -9,8 +9,8 @@
  * Administration Area - Admin Log
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
- * $Revision: 1.29 $
- * $Date: 2009-08-15 15:44:37 $
+ * $Revision: 1.30 $
+ * $Date: 2009-08-28 16:10:50 $
  * $Author: marj_nl_fr $
  *
 */
@@ -34,6 +34,8 @@ if(! getperms("S"))
 	exit();
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 // Main language file should automatically be loaded
 // Load language files for log messages
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions
diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php
index 5d7a2b584..940a5051c 100644
--- a/e107_admin/administrator.php
+++ b/e107_admin/administrator.php
@@ -9,9 +9,9 @@
  * Administrators Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/administrator.php,v $
- * $Revision: 1.13 $
- * $Date: 2009-08-05 14:22:15 $
- * $Author: e107coders $
+ * $Revision: 1.14 $
+ * $Date: 2009-08-28 16:10:58 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -28,6 +28,8 @@ if(isset($_POST['go_back']))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'admin';
 require_once('auth.php');
 
diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index eca1d3ce3..f7c8ed2ea 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -9,9 +9,9 @@
  * Ban List Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
- * $Revision: 1.16 $
- * $Date: 2009-07-17 07:53:13 $
- * $Author: e107coders $
+ * $Revision: 1.17 $
+ * $Date: 2009-08-28 16:10:55 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -34,6 +34,8 @@ if(!getperms("4"))
 	exit();
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'banlist';
 require_once ("auth.php");
 require_once (e_HANDLER."form_handler.php");
diff --git a/e107_admin/banner.php b/e107_admin/banner.php
index 6913939fb..cfa055905 100644
--- a/e107_admin/banner.php
+++ b/e107_admin/banner.php
@@ -9,8 +9,8 @@
  * Banner Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/banner.php,v $
- * $Revision: 1.13 $
- * $Date: 2009-08-15 15:44:37 $
+ * $Revision: 1.14 $
+ * $Date: 2009-08-28 16:11:01 $
  * $Author: marj_nl_fr $
  *
 */
@@ -22,6 +22,8 @@ if (!getperms("D"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'banner';
 
 require_once("auth.php");
diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index 903812567..ea9462c50 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -9,9 +9,9 @@
  * Cache Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/cache.php,v $
- * $Revision: 1.9 $
- * $Date: 2009-07-21 07:13:41 $
- * $Author: e107coders $
+ * $Revision: 1.10 $
+ * $Date: 2009-08-28 16:10:54 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once("../class2.php");
@@ -21,6 +21,8 @@ if (!getperms("C"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'cache';
 
 require_once("auth.php");
diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index c14ba5410..5ab93c15a 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -9,9 +9,9 @@
  * Custom Menus/Pages Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
- * $Revision: 1.20 $
- * $Date: 2009-08-05 14:22:15 $
- * $Author: e107coders $
+ * $Revision: 1.21 $
+ * $Date: 2009-08-28 16:10:55 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -19,6 +19,8 @@ require_once("../class2.php");
 
 if (!getperms("5|J")) { header("location:".e_BASE."index.php"); exit; }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'custom';
 
 require_once("auth.php");
diff --git a/e107_admin/credits.php b/e107_admin/credits.php
index d67ef6b29..6e70d2e2f 100644
--- a/e107_admin/credits.php
+++ b/e107_admin/credits.php
@@ -11,13 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/credits.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-07-19 11:44:27 $
+|     $Revision: 1.6 $
+|     $Date: 2009-08-28 16:11:00 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once("../class2.php");
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'credits';
 include(e_ADMIN.'ver.php');
 
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index fefd194d9..a4b1fc31b 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/cron.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-08 12:01:06 $
-|     $Author: e107coders $
+|     $Revision: 1.3 $
+|     $Date: 2009-08-28 16:11:00 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -22,6 +22,9 @@ if (!getperms('U'))
   header('location:'.e_BASE.'index.php');
   exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'cron';
 
 require_once('auth.php');
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 358194518..4394226d1 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -9,23 +9,19 @@
  * Administration - Database Utilities
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
- * $Revision: 1.20 $
- * $Date: 2009-08-28 00:33:37 $
- * $Author: e107coders $
+ * $Revision: 1.21 $
+ * $Date: 2009-08-28 16:10:59 $
+ * $Author: marj_nl_fr $
  *
 */
 
 require_once ("../class2.php");
 
-require_once (e_HANDLER."form_handler.php");
-$frm = new e_form();
-
 if(!getperms('0'))
 {
 	header('location:'.e_BASE.'index.php');
 	exit();
 }
-$e_sub_cat = 'database';
 
 if(isset($_POST['back']))
 {
@@ -33,6 +29,13 @@ if(isset($_POST['back']))
 	exit();
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
+$e_sub_cat = 'database';
+
+require_once (e_HANDLER."form_handler.php");
+$frm = new e_form();
+
 require_once (e_HANDLER."message_handler.php");
 $emessage = &eMessage::getInstance();
 
diff --git a/e107_admin/db_verify.php b/e107_admin/db_verify.php
index 5e26ddc91..4341c9ed6 100644
--- a/e107_admin/db_verify.php
+++ b/e107_admin/db_verify.php
@@ -9,13 +9,12 @@
  * Administration - DB Verify
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/db_verify.php,v $
- * $Revision: 1.5 $
- * $Date: 2008-12-30 13:51:41 $
- * $Author: secretr $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-28 16:10:53 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once("../class2.php");
-$e_sub_cat = 'database';
 
 if(varset($_POST['db_tools_back']))
 {
@@ -23,6 +22,10 @@ if(varset($_POST['db_tools_back']))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
+$e_sub_cat = 'database';
+
 require_once("auth.php");
 
 require_once(e_HANDLER."form_handler.php");
diff --git a/e107_admin/docs.php b/e107_admin/docs.php
index 9af095c58..628083646 100644
--- a/e107_admin/docs.php
+++ b/e107_admin/docs.php
@@ -9,9 +9,9 @@
  * Docs
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/docs.php,v $
- * $Revision: 1.4 $
- * $Date: 2009-01-05 16:08:38 $
- * $Author: secretr $
+ * $Revision: 1.5 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once("../class2.php");
@@ -19,6 +19,10 @@ if (!ADMIN) {
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
+
 $e_sub_cat = 'docs';
 require_once("auth.php");
 
diff --git a/e107_admin/download.php b/e107_admin/download.php
index edfbe6025..afdc9620c 100644
--- a/e107_admin/download.php
+++ b/e107_admin/download.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/download.php,v $
-|     $Revision: 1.17 $
-|     $Date: 2009-07-17 02:28:49 $
-|     $Author: e107coders $
+|     $Revision: 1.18 $
+|     $Date: 2009-08-28 16:10:56 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -26,6 +26,9 @@ if (!getperms("R"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
+
 require_once(e_HANDLER."calendar/calendar_class.php");
 $cal = new DHTML_Calendar(true);
 function headerjs()
diff --git a/e107_admin/e107_update.php b/e107_admin/e107_update.php
index 6dffded01..d81f727e5 100644
--- a/e107_admin/e107_update.php
+++ b/e107_admin/e107_update.php
@@ -9,13 +9,15 @@
  * Administration - e107 System Update
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/e107_update.php,v $
- * $Revision: 1.5 $
- * $Date: 2008-12-30 15:56:12 $
- * $Author: secretr $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once ("../class2.php");
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'database';
 
 require_once ("auth.php");
diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php
index b7ef39a52..97cf9ff29 100644
--- a/e107_admin/emoticon.php
+++ b/e107_admin/emoticon.php
@@ -9,8 +9,8 @@
  * Administration Area - Emotions Settings & Packs
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $
- * $Revision: 1.15 $
- * $Date: 2009-08-15 15:44:37 $
+ * $Revision: 1.16 $
+ * $Date: 2009-08-28 16:11:00 $
  * $Author: marj_nl_fr $
  *
 */
@@ -22,6 +22,8 @@ if (!getperms("F"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'emoticon';
 
 require_once("auth.php");
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index 2d2a810d3..32ad2f5bf 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -9,9 +9,9 @@
  * URL Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/eurl.php,v $
- * $Revision: 1.8 $
- * $Date: 2009-01-09 17:25:50 $
- * $Author: secretr $
+ * $Revision: 1.9 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
 */
 
 require_once('../class2.php');
@@ -21,6 +21,8 @@ if (!getperms('L'))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'eurl';
 require_once(e_ADMIN.'auth.php');
 require_once(e_HANDLER."form_handler.php");
diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php
index 5615e6e7e..7a93f9a09 100644
--- a/e107_admin/fileinspector.php
+++ b/e107_admin/fileinspector.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $
-|     $Revision: 1.16 $
-|     $Date: 2009-07-18 15:14:38 $
+|     $Revision: 1.17 $
+|     $Date: 2009-08-28 16:11:00 $
 |     $Author: marj_nl_fr $
 
 Includes standalone function - needs finishing
@@ -125,6 +125,8 @@ if (!getperms('Y')) {
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'fileinspector';
 
 require_once('auth.php');
@@ -949,8 +951,8 @@ class file_inspector {
 			$data .= "|     GNU General Public License (http://gnu.org).\n";
 			$data .= "|\n";
 			$data .= "|     \$Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $\n";
-			$data .= "|     \$Revision: 1.16 $\n";
-			$data .= "|     \$Date: 2009-07-18 15:14:38 $\n";
+			$data .= "|     \$Revision: 1.17 $\n";
+			$data .= "|     \$Date: 2009-08-28 16:11:00 $\n";
 			$data .= "|     \$Author: marj_nl_fr $\n";
 			$data .= "+----------------------------------------------------------------------------+\n";
 			$data .= "*/\n\n";
diff --git a/e107_admin/filemanager.php b/e107_admin/filemanager.php
index 1d17b3313..80e3db2ac 100644
--- a/e107_admin/filemanager.php
+++ b/e107_admin/filemanager.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/filemanager.php,v $
-|     $Revision: 1.9 $
-|     $Date: 2009-07-25 07:52:16 $
+|     $Revision: 1.10 $
+|     $Date: 2009-08-28 16:10:54 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
@@ -22,6 +22,9 @@ if (!getperms("6"))
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'filemanage';
 require_once("auth.php");
 require_once(e_HANDLER.'upload_handler.php');
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 8c76e1492..589b7e3f7 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -9,9 +9,9 @@
  * Administration Area - Front page
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $
- * $Revision: 1.12 $
- * $Date: 2009-07-21 07:41:54 $
- * $Author: e107coders $
+ * $Revision: 1.13 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -21,6 +21,9 @@ if(! getperms('G'))
 	header('location:'.e_BASE.'index.php');
 	exit();
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'frontpage';
 require_once ('auth.php');
 require_once (e_HANDLER.'form_handler.php');
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 40dfeb0e1..ad3ee17df 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -9,9 +9,9 @@
  * Image Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
- * $Revision: 1.21 $
- * $Date: 2009-07-16 08:15:35 $
- * $Author: e107coders $
+ * $Revision: 1.22 $
+ * $Date: 2009-08-28 16:11:01 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once("../class2.php");
@@ -21,6 +21,8 @@ if (!getperms("A"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'image';
 
 require_once("auth.php");
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index 9dc0d385d..5e0eb6e3c 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -10,8 +10,8 @@
  * With code from Izydor and Lolo.
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/lancheck.php,v $
- * $Revision: 1.16 $
- * $Date: 2009-08-15 15:53:44 $
+ * $Revision: 1.17 $
+ * $Date: 2009-08-28 16:11:00 $
  * $Author: marj_nl_fr $
  *
 */
@@ -20,6 +20,9 @@ if (!getperms("0")) {
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'language';
 require_once("auth.php");
 require_once(e_HANDLER."message_handler.php");
diff --git a/e107_admin/language.php b/e107_admin/language.php
index fd4a39478..b56e3fdb8 100644
--- 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.17 $
- * $Date: 2009-08-15 15:53:44 $
+ * $Revision: 1.18 $
+ * $Date: 2009-08-28 16:11:01 $
  * $Author: marj_nl_fr $
  *
 */
@@ -22,6 +22,8 @@ if (!getperms('0'))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'language';
 
 require_once("auth.php");
diff --git a/e107_admin/links.php b/e107_admin/links.php
index 9a9c80f6e..74ba8e465 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -9,9 +9,9 @@
  * Administration Area - Site Links
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
- * $Revision: 1.28 $
- * $Date: 2009-08-19 14:35:12 $
- * $Author: secretr $
+ * $Revision: 1.29 $
+ * $Date: 2009-08-28 16:10:54 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -22,6 +22,8 @@ if(!getperms('I'))
 	exit();
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'links';
 
 if(!is_object($tp))
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 2aa44565d..fba51df11 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
-|     $Revision: 1.16 $
-|     $Date: 2009-07-25 07:52:16 $
+|     $Revision: 1.17 $
+|     $Date: 2009-08-28 16:10:53 $
 |     $Author: marj_nl_fr $
 |
 | Work in progress - supplementary mailer plugin
@@ -51,17 +51,21 @@ Each mailout task is implemented as a class, which must include a number of mand
 */
 
 require_once("../class2.php");
+
+if (!getperms("W"))
+{
+	header("location:".e_BASE."index.php");
+	 exit;
+}
+//TODO multilanguage?
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'mail';
 
 set_time_limit(180);
 session_write_close();
 require_once(e_ADMIN."auth.php");
 require_once(e_HANDLER."ren_help.php");
-if (!getperms("W")) 
-{
-	header("location:".e_BASE."index.php");
-	 exit;
-}
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_users.php");
 require_once(e_HANDLER."userclass_class.php");
 
diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 80a6df53d..589f6c8f8 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -10,9 +10,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/menus.php,v $
-|     $Revision: 1.33 $
-|     $Date: 2009-08-19 14:39:56 $
-|     $Author: secretr $
+|     $Revision: 1.34 $
+|     $Date: 2009-08-28 16:11:02 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 if(isset($_GET['configure']))
@@ -29,6 +29,9 @@ if (!getperms("2"))
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'menus';
 
 require_once(e_HANDLER."file_class.php");
diff --git a/e107_admin/message.php b/e107_admin/message.php
index ce1842d13..039608f05 100644
--- a/e107_admin/message.php
+++ b/e107_admin/message.php
@@ -11,13 +11,15 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/message.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-12-09 13:55:21 $
-|     $Author: e107steved $
+|     $Revision: 1.3 $
+|     $Date: 2009-08-28 16:11:00 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'message';
 require_once("auth.php");
 $gen = new convert;
diff --git a/e107_admin/meta.php b/e107_admin/meta.php
index 73b06066d..0c6e71746 100644
--- a/e107_admin/meta.php
+++ b/e107_admin/meta.php
@@ -9,8 +9,8 @@
  * Administration Area - Meta Tags
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/meta.php,v $
- * $Revision: 1.9 $
- * $Date: 2009-08-15 15:53:44 $
+ * $Revision: 1.10 $
+ * $Date: 2009-08-28 16:10:56 $
  * $Author: marj_nl_fr $
  *
 */
@@ -19,6 +19,9 @@ if (!getperms("T")) {
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'meta';
 require_once("auth.php");
 require_once(e_HANDLER."message_handler.php");
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php
index 2fdfb4e71..5aca5e729 100644
--- a/e107_admin/modcomment.php
+++ b/e107_admin/modcomment.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/modcomment.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-07-25 07:52:16 $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 16:11:00 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
@@ -21,6 +21,9 @@ if (!getperms("B")) {
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 require_once("auth.php");
 require_once(e_HANDLER."comment_class.php");
 $cobj = new comment;
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index ffe693a79..2d8936d5c 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -9,9 +9,9 @@
  * News Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
- * $Revision: 1.48 $
- * $Date: 2009-08-24 08:34:55 $
- * $Author: secretr $
+ * $Revision: 1.49 $
+ * $Date: 2009-08-28 16:11:01 $
+ * $Author: marj_nl_fr $
 */
 require_once("../class2.php");
 
@@ -21,6 +21,7 @@ if (!getperms("H|7|N"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 
 // -------- Presets. ------------  // always load before auth.php
 require_once(e_HANDLER."preset_class.php");
diff --git a/e107_admin/notify.php b/e107_admin/notify.php
index 93a98f9a3..fc9d991f2 100644
--- a/e107_admin/notify.php
+++ b/e107_admin/notify.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/notify.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-07-14 03:18:16 $
-|     $Author: e107coders $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 16:10:54 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -23,6 +23,8 @@ if (!getperms('O'))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'notify';
 
 require_once('auth.php');
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 0af0dfdc3..86d501a6e 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.38 $
-|     $Date: 2009-08-17 18:42:19 $
-|     $Author: e107coders $
+|     $Revision: 1.39 $
+|     $Date: 2009-08-28 16:10:57 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -23,6 +23,9 @@ if (!getperms("Z"))
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'plug_manage';
 
 define('PLUGIN_SHOW_REFRESH', FALSE);
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 8ce4078bd..c05145f4f 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,18 +9,13 @@
  * Administration - Site Preferences
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
- * $Revision: 1.33 $
- * $Date: 2009-08-20 11:38:24 $
- * $Author: e107coders $
+ * $Revision: 1.34 $
+ * $Date: 2009-08-28 16:10:59 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once ("../class2.php");
 
-require_once (e_HANDLER."userclass_class.php");
-require_once (e_HANDLER."user_extended_class.php");
-$e_userclass = new user_class();
-$ue = new e107_user_extended();
-
 if(isset($_POST['newver']))
 {
 	header("location:http://e107.org/index.php");
@@ -33,7 +28,14 @@ if(! getperms("1"))
 	exit();
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'prefs';
+require_once (e_HANDLER."userclass_class.php");
+require_once (e_HANDLER."user_extended_class.php");
+$e_userclass = new user_class();
+$ue = new e107_user_extended();
+
 if(! $pref['timezone'])
 {
 	$pref['timezone'] = "GMT";
diff --git a/e107_admin/search.php b/e107_admin/search.php
index 0c621d48c..6d1b226ff 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -9,8 +9,8 @@
  * Search Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/search.php,v $
- * $Revision: 1.6 $
- * $Date: 2009-08-15 15:44:37 $
+ * $Revision: 1.7 $
+ * $Date: 2009-08-28 16:10:53 $
  * $Author: marj_nl_fr $
  *
 */
@@ -21,6 +21,9 @@ if (!getperms('X'))
 	header('location:'.e_BASE.'index.php');
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'search';
 require_once('auth.php');
 require_once(e_HANDLER.'userclass_class.php');
diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index de59ec2e7..bf069e797 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/theme.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-07-18 03:41:49 $
-|     $Author: e107coders $
+|     $Revision: 1.5 $
+|     $Date: 2009-08-28 16:11:01 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -22,6 +22,9 @@ if (!getperms("1")) {
 	header("location:".e_BASE."index.php");
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'theme_manage';
 
 require_once("auth.php");
diff --git a/e107_admin/ugflag.php b/e107_admin/ugflag.php
index 7083b5396..77e626298 100644
--- a/e107_admin/ugflag.php
+++ b/e107_admin/ugflag.php
@@ -9,9 +9,9 @@
  * Administration - Site Maintenance
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/ugflag.php,v $
- * $Revision: 1.3 $
- * $Date: 2009-01-07 15:40:06 $
- * $Author: secretr $
+ * $Revision: 1.4 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
  *
 */
 require_once("../class2.php");
@@ -21,6 +21,8 @@ if (!getperms("9"))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 require_once(e_HANDLER."form_handler.php");
 require_once (e_HANDLER."message_handler.php");
 $emessage = &eMessage::getInstance();
diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php
index 20e6d8c35..c0699777e 100644
--- a/e107_admin/updateadmin.php
+++ b/e107_admin/updateadmin.php
@@ -9,13 +9,16 @@
  * Administration Area - Update Admin
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/updateadmin.php,v $
- * $Revision: 1.6 $
- * $Date: 2009-08-15 15:44:37 $
+ * $Revision: 1.7 $
+ * $Date: 2009-08-28 16:10:56 $
  * $Author: marj_nl_fr $
  *
 */
 
 require_once('../class2.php');
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'admin_pass';
 
 require_once(e_ADMIN.'auth.php');
diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index 60f809c3c..8f2b4fd98 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/upload.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-12-06 23:00:19 $
-|     $Author: e107steved $
+|     $Revision: 1.9 $
+|     $Date: 2009-08-28 16:10:51 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -22,6 +22,9 @@ if (!getperms("V"))
   header("location:".e_BASE."index.php");
   exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'upload';
 
 
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index dd2df2c76..bdaf409bc 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -9,9 +9,9 @@
  * Administration Area - User classes
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
- * $Revision: 1.27 $
- * $Date: 2009-08-22 21:27:34 $
- * $Author: e107steved $
+ * $Revision: 1.28 $
+ * $Date: 2009-08-28 16:11:00 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -21,6 +21,9 @@ if (!getperms("4"))
   header("location:".e_BASE."index.php");
   exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'userclass';
 //define('UC_DEBUG_OPTS',FALSE);
 
diff --git a/e107_admin/users.php b/e107_admin/users.php
index e1fe04889..80b5d0e8d 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -10,18 +10,21 @@
 * Administration Area - Users
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
-* $Revision: 1.56 $
-* $Date: 2009-08-26 21:17:20 $
-* $Author: bugrain $
+* $Revision: 1.57 $
+* $Date: 2009-08-28 16:11:01 $
+* $Author: marj_nl_fr $
 *
 */
 require_once ('../class2.php');
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php');
 if (!getperms('4'))
 {
 	header('location:'.$e107->url->getUrl('core:core','main','action=index'));
 	exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php');
+
 if (varset($_POST['useraction']))
 {
 	foreach ($_POST['useraction'] as $key => $val)
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index e6dc4c4c7..957938518 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $
-|     $Revision: 1.18 $
-|     $Date: 2009-08-10 20:51:59 $
-|     $Author: e107coders $
+|     $Revision: 1.19 $
+|     $Date: 2009-08-28 16:10:58 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -33,6 +33,8 @@ if (isset($_POST['cancel_cat']))
 	exit;
 }
 
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'user_extended';
 
 $curtype = '1';
diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index 01376c887..6e60e4e8f 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/wmessage.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-07-17 07:53:13 $
-|     $Author: e107coders $
+|     $Revision: 1.6 $
+|     $Date: 2009-08-28 16:11:00 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -22,6 +22,9 @@ if (!getperms("M"))
 	header("location:".e_BASE."index.php");
 	 exit;
 }
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 $e_sub_cat = 'wmessage';
 
 require_once(e_HANDLER."preset_class.php");