diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index 5f10196b66..a68e6e71e2 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -228,6 +228,7 @@
 		$p->set_file($templates);
 
 		$p->set_var('color',$phpgw_info['theme']['bg_text']);
+		$p->set_var('overlap_title',lang('Scheduling Conflict'));
 
 		$cal_stream = $phpgw->calendar->open('INBOX',intval($owner),'');
 		$overlap = '';
diff --git a/calendar/templates/default/overlap.tpl b/calendar/templates/default/overlap.tpl
index a1e8563cc3..18c9076397 100755
--- a/calendar/templates/default/overlap.tpl
+++ b/calendar/templates/default/overlap.tpl
@@ -2,7 +2,7 @@
 <!-- BEGIN overlap -->
 <center>
 <h2>
- <font color="{color}">Scheduling Conflict</font>
+ <font color="{color}">{overlap_title}</font>
 </h2>
 <table>
  <tr><td>{overlap_text}</td></tr>
diff --git a/setup/phpgw_en.lang b/setup/phpgw_en.lang
index f9fe0c5a6d..cdc50d678b 100644
--- a/setup/phpgw_en.lang
+++ b/setup/phpgw_en.lang
@@ -64,6 +64,7 @@ are you sure you want to delete this application ?	admin	en	Are you sure you wan
 are you sure you want to delete this entry ?	common	en	Are you sure you want to delete this entry ?
 are you sure you want to delete this entry	todo	en	Are you sure you want to delete this entry?
 are you sure you want to delete this group ?	admin	en	Are you sure you want to delete this group ?
+are you sure you want to delete this holiday ?	calendar	en	Are you sure you want to delete this holiday ?
 are you sure you want to delete this news site ?	admin	en	Are you sure you want to delete this news site ?
 are you sure you want to delete this note ?	notes	en	Are you sure you want to delete this note ?
 are you sure you want to kill this session ?	admin	en	Are you sure you want to kill this session ?
@@ -501,6 +502,7 @@ sa	calendar	en	Sa
 sat	calendar	en	Sat
 saturday	common	en	Saturday
 save	common	en	Save
+scheduling conflict	calendar	en	Scheduling Conflict
 search	common	en	Search
 search results	calendar	en	Search Results
 section	email	en	Section