diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index 4b60f0c7b9..afb10165fb 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -88,10 +88,11 @@
 
   $phpgw->template->set_file(array("edit_entry_begin" => "edit.tpl",
 				   "list"     	      => "list.tpl",
+				   "hr"     	      => "hr.tpl",
 				   "edit_entry_end"   => "edit.tpl",
 				   "form_button"      => "form_button_script.tpl"));
 
-  $phpgw->template->set_block("edit_entry_begin","list","edit_entry_end","form_button");
+  $phpgw->template->set_block("edit_entry_begin","list","hr","edit_entry_end","form_button");
 
   $phpgw->template->set_var("bg_color",$phpgw_info["theme"]["bg_text"]);
   if($id)
@@ -218,6 +219,8 @@
     display_item(lang("I Participate"),$str);
 
 // Repeat Type
+    $phpgw->template->parse("output","hr",True);
+    display_item("<hr>".lang("Repeating Event Information"),"<hr>");
     $str = "<select name=\"cal[rpt_type]\">";
     $rpt_type_str = Array("none","daily","weekly","monthlybyday","monthlybydate","yearly");
     $rpt_type_out = Array("none" => "None", "daily" => "Daily", "weekly" => "Weekly", "monthlybyday" => "Monthly (by day)", "monthlybydate" => "Monthly (by date)", "yearly" => "yearly");
diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php
index eab1d8c8cf..da737e97a6 100644
--- a/calendar/inc/header.inc.php
+++ b/calendar/inc/header.inc.php
@@ -94,13 +94,13 @@
       }
     } ?>
     <select name="filter" onchange="document.filtermethod.submit()">
-     <option value="all"<?php if($filter=="all") echo " selected"; ?>>All</option>
-     <option value="private"<?php if((!isset($filter) || !$filter) || $filter=="private") echo " selected"; ?>>Private Only</option>
-     <option value="public"<?php if($filter=="public") echo " selected"; ?>>Global Public Only</option>
-     <option value="group"<?php if($filter=="group") echo " selected"; ?>>Group Public Only</option>
-     <option value="private+public"<?php if($filter=="private+public") echo " selected"; ?>>Private and Global Public</option>
-     <option value="private+group"<?php if($filter=="private+group") echo " selected"; ?>>Private and Group Public</option>
-     <option value="public+group"<?php if($filter=="public+group") echo " selected"; ?>>Global Public and Group Public</option>
+     <option value="all"<?php if($filter=="all") echo " selected"; ?>><?php echo lang("All"); ?></option>
+     <option value="private"<?php if((!isset($filter) || !$filter) || $filter=="private") echo " selected"; ?>><?php echo lang("Private Only"); ?></option>
+     <option value="public"<?php if($filter=="public") echo " selected"; ?>><?php echo lang("Global Public Only"); ?></option>
+     <option value="group"<?php if($filter=="group") echo " selected"; ?>><?php echo lang("Group Public Only"); ?></option>
+     <option value="private+public"<?php if($filter=="private+public") echo " selected"; ?>><?php echo lang("Private and Global Public"); ?></option>
+     <option value="private+group"<?php if($filter=="private+group") echo " selected"; ?>><?php echo lang("Private and Group Public"); ?></option>
+     <option value="public+group"<?php if($filter=="public+group") echo " selected"; ?>><?php echo lang("Global Public and Group Public"); ?></option>
     </select>
     <NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang("Go!"); ?>"></NOSCRIPT></FONT>
    </td>
diff --git a/calendar/matrixselect.php b/calendar/matrixselect.php
index a9707597a5..77acc05954 100755
--- a/calendar/matrixselect.php
+++ b/calendar/matrixselect.php
@@ -126,16 +126,8 @@
   $phpgw->template->set_var("data",$str);
   $phpgw->template->parse("output","list",True);
 
-//  $phpgw->template->set_var("action_url_button","");
-//  $phpgw->template->set_var("action_text_button",lang("Submit"));
-//  $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
-//  $phpgw->template->parse("submit_button","form_button");
   $phpgw->template->set_var("submit_button",lang("Submit"));
 
-//<!-- {submit_button} -->
-
-
-
   $phpgw->template->set_var("action_url_button","");
   $phpgw->template->set_var("action_text_button",lang("Cancel"));
   $phpgw->template->set_var("action_confirm_button","onClick=\"history.back(-1)\"");
diff --git a/calendar/templates/default/list.tpl b/calendar/templates/default/list.tpl
index f4692ac23b..0eed08e20d 100755
--- a/calendar/templates/default/list.tpl
+++ b/calendar/templates/default/list.tpl
@@ -5,4 +5,3 @@
   <td valign="top" width="80%">{data}</td>
  </tr>
 <!-- END list -->
-
diff --git a/setup/phpgw_en.lang b/setup/phpgw_en.lang
index 743304c163..45fe8c6686 100644
--- a/setup/phpgw_en.lang
+++ b/setup/phpgw_en.lang
@@ -26,6 +26,7 @@ addsub	todo	en	AddSub
 admin	common	en	Admin
 administration	common	en	Administration
 all	transy	en	All
+all	calendar	en	All
 all records and account information will be lost!	admin	en	All records and account information will be lost!
 anonymous user	admin	en	Anonymous user
 any	transy	en	Any
@@ -86,6 +87,7 @@ created by	todo	en	Created By
 current users	common	en	Current users
 current_file	filemanager	en	Current File
 daily	calendar	en	Daily
+daily matrix view	calendar	en	Daily Matrix View
 date	common	en	Date
 date	email	en	Date
 date	nntp	en	Date
@@ -122,6 +124,7 @@ email password	email	en	Email Password
 email signature	email	en	E-Mail signature
 enabled	admin	en	Enabled
 enabled - hidden from navbar	admin	en	Enabled - Hidden from navbar
+end date/time	calendar	en	End Date/Time
 enter your new password	preferences	en	Enter your new password
 entry has been deleted sucessfully	common	en	Entry has been deleted sucessfully
 entry updated sucessfully	common	en	Entry updated sucessfully
@@ -156,6 +159,8 @@ full description	calendar	en	Full Description
 generate new lang.sql file	transy	en	Generate new lang.sql file
 generate printer-friendly version	calendar	en	Generate printer-friendly version
 global public	common	en	Global Public
+global public and group public	calendar	en	Global Public and group public
+global public only	calendar	en	Global Public Only
 go!	calendar	en	Go!
 group access	common	en	Group Access
 group has been added	common	en	Group has been added
@@ -163,6 +168,7 @@ group has been deleted	common	en	Group has been deleted
 group has been updated	common	en	Group has been updated
 group name	admin	en	Group Name
 group public	common	en	Group Public
+group public only	calendar	en	Group Public Only
 groups	common	en	Groups
 groupsfile_perm_error	filemanager	en	To correct this error you will need to properly set the permissions to the files/groups directory.<BR> On *nix systems please type: chmod 707
 group_files	filemanager	en	group files
@@ -286,8 +292,11 @@ previous page	common	en	Previous page
 print	common	en	Print
 printer friendly	calendar	en	Printer Friendly
 priority	common	en	Priority
-private	common	en	Private
+private and global public	calendar	en	Private and Global Public
+private and group public	calendar	en	Private and Group Public
 private_files	filemanager	en	Private files
+private	common	en	Private
+private only	calendar	en	Private Only
 project description	todo	en	Project Description
 re-edit event	calendar	en	Re-Edit Event
 re-enter password	admin	en	Re-enter password
@@ -301,6 +310,7 @@ rename_to	filemanager	en	Rename to
 repeat day	calendar	en	Repeat day
 repeat end date	calendar	en	Repeat End date
 repeat type	calendar	en	Repeat type
+repeating event information	calendar	en	Repeating Event Information
 repetition	calendar	en	Repetition
 reply	email	en	Reply
 reply all	email	en	Reply All
@@ -342,6 +352,7 @@ sorry, there was a problem processing your request.	common	en	Sorry, there was a
 sorry, your login has expired	login	en	Sorry, your login has expired
 source language	transy	en	Source Language
 specify_file_name	filemanager	en	You must specify a name for the file you wish to create
+start date/time	calendar	en	Start Date/Time
 state	addressbook	en	State
 status	todo	en	Status
 status	admin	en	Status