-
<div class="mimepart">
<div id="rsvp<?BSTR("divname")>_title">
<?--("If this is a REQUEST, display conflicts and buttons")>
<?!("COND:ICAL:METHOD", 110, #"ICAL_METHOD_REQUEST")>
-<?ICAL:SERV:CHECK:CONFLICT()>
+<?ITERATE("ICAL:CONFLICT", ="ical_attachment_display_conflict")>
<?--("Display the Accept/Decline buttons")>
<p id="rsvp<?BSTR("divname")>_question">
<?_("How would you like to respond to this invitation?")>
--- /dev/null
+<dt>
+<??("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:" )><??("X", 30)>
+<??("ICAL:CONFLICT:IS:UPDATE", 40)><?_("CONFLICT:")><??("X", 40)>
+</dt><dd>
+<??("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of" )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
+</dd>