diff --git a/calendar/help/EN/add.php b/calendar/help/EN/add.php
new file mode 100755
index 0000000000..da379770f4
--- /dev/null
+++ b/calendar/help/EN/add.php
@@ -0,0 +1,46 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$font = $phpgw_info['theme']['font'];
+?>
+<img src="<?php echo $phpgw->common->image('calendar','navbar.gif'); ?>" border="0">
+<font face="<?php echo $font; ?>" size="2"><p/>
+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events.<br/>
+<ul><li><b>Adding an entry:</b> <img src="<?php echo $phpgw->common->image('calendar','new.gif'); ?>"><br/>
+To add a new entry for yourself other members of your group click on the small icon as shown above.
+A form page will be presented, where you can input the relevant fields.</li><p/>
+<table width="80%">
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font ?>" size="2">
+Brief Description:<br/>
+Full Description:<br/>
+Date:<br/>
+Time:<br/>
+Duration:<br/>
+Priority:<br/>
+Acccess:</td>
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+Group selection:<br/>
+Participants;<br/>
+Repeat type:<br/>
+Repeat end date:<br/>
+Frequency:</td></table>
+Simply fill in the fields, and click Submit.</ul><br/>
+<b>Note:</b> Access can be set as with other applications in this suite, Private,Group Readable,Globally
+Readable.<p/></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/calendar/help/EN/calendar.php b/calendar/help/EN/calendar.php
new file mode 100755
index 0000000000..7c59595553
--- /dev/null
+++ b/calendar/help/EN/calendar.php
@@ -0,0 +1,64 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$font = $phpgw_info['theme']['font'];
+?>
+<img src="<?php echo $phpgw->common->image('calendar','navbar.gif'); ?>" border="0">
+<font face="<?php echo $font; ?>" size="2"><p/>
+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events.<br/>
+For viewing in either hourly/day,current week or monthly option, click on the relevant 
+icons at the top left hand corner.<br/>
+<ul><li><b>Viewing:</b><img src="<?php echo $phpgw->common->image('calendar','today.gif'); ?>">Day <img src="<?php echo $phpgw->common->image('calendar','week.gif'); ?>">Week <img src="<?php echo $phpgw->common->image('calendar','month.gif'); ?>">Month <img src="<?php echo $phpgw->common->image('calendar','year.gif'); ?>">Year<br/>
+<i>Day:</i><br/>
+Current day is displayed, broken down in hour slots. Start and end time of the day
+can be set in the preferences.<br/>
+<i>Week:</i><br/>
+Current week is displayed. Start day of week can be set in preferences.<br/>
+<i>Month:</i><br/>
+Default entry is to the current month, viewed in monthly option, with both prior and future
+months easily accessible with one click.<br/>
+<i>Year:</i><br/>
+Current year is displayed. This displays the current year using the small calendar month views.</li><p/>
+<li><b>Adding an entry:</b> <img src="<?php echo $phpgw->common->image('calendar','new.gif'); ?>"><br/>
+To add a new entry for yourself other members of your group click on the small icon as shown above.
+A form page will be presented, where you can input the relevant fields.
+<table width="80%">
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+Brief Description:<br/>
+Full Description:<br/>
+Date:<br/>
+Time:<br/>
+Duration:<br/>
+Priority:<br/>
+Acccess:</td>
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+Group selection:<br/>
+Participants;<br/>
+Repeat type:<br/>
+Repeat end date:<br/>
+Frequency:</td></table>
+Simply fill in the fields, and click Submit.<br/>
+<b>Note:</b> Access can be set as with other applications in this suite, Private,Group Readable,Globally Readable.</li><p/>
+<li><b>Edit:Delete</b>&nbsp&nbsp<img src="<?php echo $phpgw->common->image('calendar','circle.gif'); ?>"><br/>
+To edit an entry group click on the small icon as shown above.
+A form page will be presented, where you can edit the relevant fields.
+Chose edit or delete from the bottom of the page.<br/>
+<b>Note:</b>You can only make changes or delete those calendar entries created by you.</li><p/></ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/calendar/help/EN/edit_delete.php b/calendar/help/EN/edit_delete.php
new file mode 100755
index 0000000000..95bba0be81
--- /dev/null
+++ b/calendar/help/EN/edit_delete.php
@@ -0,0 +1,28 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+?>
+<img src="<?php echo $phpgw->common->image('calendar','navbar.gif'); ?>" border="0">
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events.<br/>
+<ul><li><b>Edit:Delete</b>&nbsp&nbsp<img src="<?php echo $phpgw->common->image('calendar','circle.gif'); ?>"><br/>
+To edit an entry group click on the small icon as shown above.
+A form page will be presented, where you can edit the relevant fields.
+Chose edit or delete from the bottom of the page.</li><p/>
+<b>Note:</b>You can only make changes or delete those calendar entries created by you.<p/></ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/calendar/help/EN/view.php b/calendar/help/EN/view.php
new file mode 100755
index 0000000000..ec324d126b
--- /dev/null
+++ b/calendar/help/EN/view.php
@@ -0,0 +1,40 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual',
+		'enable_utilities_class'	=> True
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../header.inc.php');
+?>
+<img src="<?php echo $phpgw->common->image('calendar','navbar.gif'); ?>" border=0> 
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
+<p>
+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events.
+<br> For viewing in either hourly/day,current week or monthly option, click on the relevant 
+icons at the top left hand corner.
+<br>
+<ul>
+<li><b>Viewing:</b><img src="<?php echo $phpgw->common->image('calendar','today.gif'); ?>">Day <img src="<?php echo $phpgw->common->image('calendar','week.gif'); ?>">Week <img src="<?php echo $phpgw->common->image('calendar','month.gif'); ?>">Month <img src="<?php echo $phpgw->common->image('calendar','year.gif'); ?>">Year
+<p><i>Day:</i>
+<br>Current day is displayed, broken down in hour slots. Start and end time of the day
+can be set in the preferences.
+<p><i>Week:</i>
+<br>Current week is displayed. Start day of week can be set in preferences.
+<p><i>Month:</i>
+<br>Default entry is to the current month, viewed in monthly option, with both prior and future
+months easily accessible with one click.
+<p>
+</ul>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/calendar/inc/hook_manual.inc.php b/calendar/inc/hook_manual.inc.php
index 37622abb8e..dc150e3f80 100755
--- a/calendar/inc/hook_manual.inc.php
+++ b/calendar/inc/hook_manual.inc.php
@@ -16,13 +16,29 @@
 		global $phpgw, $phpgw_info, $treemenu;
 	}
 
+// Only Modify the $file variable.....
+	$file = Array(
+		'Viewing'	=>	'view.php',
+		'Adding'	=> 'add.php',
+		'Edit/Deleting'	=> 'edit_delete.php'
+	);
+//Do not modify below this line
 	$font = $phpgw_info['theme']['font'];
 	$navbar = $phpgw_info['user']['preferences']['common']['navbar_format'];
-
+	$lang = strtoupper($phpgw_info['user']['preferences']['common']['lang']);
 	$treemenu[] = '..'.($navbar != 'text'?'<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">':'').($navbar != 'icons'?'<font face="'.$font.'">'.ucwords($appname).'</font>':'').'|'.$phpgw->link('/'.$appname.'/help/index.php');
-	$treemenu[] = '...<font face="'.$font.'">Overview</font>|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php');
-// Modify the $treemenu variables from here down.....
-	$treemenu[] = '...<font face="'.$font.'">Viewing</font>|'.$phpgw->link('/'.$appname.'/help/view.php');
-	$treemenu[] = '...<font face="'.$font.'">Adding</font>|'.$phpgw->link('/'.$appname.'/help/add.php');
-	$treemenu[] = '...<font face="'.$font.'">Edit/Deleting</font>|'.$phpgw->link('/'.$appname.'/help/edit_delete.php');
+
+	$help_file = check_help_file($appname,$lang,$appname.'.php');
+	if($help_file != '')
+	{
+		$treemenu[] = '...<font face="'.$font.'">Overview</font>|'.$phpgw->link($help_file);
+	}
+	while(list($title,$filename) = each($file))
+	{
+		$help_file = check_help_file($appname,$lang,$filename);
+		if($help_file != '')
+		{
+			$treemenu[] = '...<font face="'.$font.'">'.$title.'</font>|'.$phpgw->link($help_file);
+		}
+	}
 ?>