extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 19:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'Scheduling Conflict' from template.

Browse Source
This commit is contained in:
skeeter 2001-05-17 01:14:29 +00:00
parent 325831f748
commit 71ecb0af10
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/edit_entry_handler.php
View File

@ -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 = '';

2
calendar/templates/default/overlap.tpl
View File

@ -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>

2
setup/phpgw_en.lang
View File

@ -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