X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fical%2Fattachment%2Fdisplay_conflict.html;fp=webcit%2Fstatic%2Ft%2Fical%2Fattachment%2Fdisplay_conflict.html;h=47fb42aed8415931f217f8aa1fd1d0f876e7cc3e;hp=0000000000000000000000000000000000000000;hb=b7f1665b64318cee1b14d13f7e9fdb6a323189a4;hpb=1598983613cc27cab89d9036062ce6d17eb286d5

diff --git a/webcit/static/t/ical/attachment/display_conflict.html b/webcit/static/t/ical/attachment/display_conflict.html
new file mode 100644
index 000000000..47fb42aed
--- /dev/null
+++ b/webcit/static/t/ical/attachment/display_conflict.html
@@ -0,0 +1,7 @@
+<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>