From 046112475fe2510dce005d225e0563b2683b829f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 15 Nov 2006 18:42:19 +0000
Subject: [PATCH] Monotone-Parent: 00ae3ecd49fb788c9161dae870b23b47b6f5380c
 Monotone-Revision: e119548d14311d073bbaa138dff7627a43a4e50d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-15T18:42:19
Monotone-Branch: ca.inverse.sogo
---
 .../ContactsUI/UIxContactsAddressBooksSelection.wox        | 2 +-
 UI/Templates/ContactsUI/UIxContactsCalendarsSelection.wox  | 2 +-
 UI/Templates/SchedulerUI/UIxAppointmentEditor.wox          | 7 +------
 UI/Templates/SchedulerUI/UIxTaskEditor.wox                 | 7 +------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsAddressBooksSelection.wox b/UI/Templates/ContactsUI/UIxContactsAddressBooksSelection.wox
index 90e198466..daf472d70 100644
--- a/UI/Templates/ContactsUI/UIxContactsAddressBooksSelection.wox
+++ b/UI/Templates/ContactsUI/UIxContactsAddressBooksSelection.wox
@@ -10,7 +10,7 @@
     >
     <input type="submit"
       class="button"
-      label:value="Add Agenda..."
+      label:value="Add Address Book..."
       name="validate"
       onclick="return onConfirmAddressBookSelection();" />
   </div>
diff --git a/UI/Templates/ContactsUI/UIxContactsCalendarsSelection.wox b/UI/Templates/ContactsUI/UIxContactsCalendarsSelection.wox
index 0852a8cd6..06888b3e8 100644
--- a/UI/Templates/ContactsUI/UIxContactsCalendarsSelection.wox
+++ b/UI/Templates/ContactsUI/UIxContactsCalendarsSelection.wox
@@ -10,7 +10,7 @@
     >
     <input type="submit"
       class="button"
-      label:value="Add Agenda..."
+      label:value="Add Calendar..."
       name="validate"
       onclick="return onConfirmContactSelection(null);" />
   </div>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index a6e13dcea..663ae4713 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -56,12 +56,7 @@
                 date="aptEndDate"
                 const:dayStartHour="0"
                 const:dayEndHour="23"
-                /><label><input type="checkbox"
-                  class="checkBox"
-                  var:selection="checkForConflicts"
-                  var:checked="checkForConflicts"
-                  /><var:string label:value="check for conflicts"
-                  /></label></span></span>
+                /></span></span>
           <hr />
           <!-- label id="isPrivate"><input class="checkBox"
           type="checkbox" var:selection="isPrivate"
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index 07f52fd20..b9196e0c7 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -62,12 +62,7 @@
                 date="taskDueDate"
                 const:dayStartHour="0"
                 const:dayEndHour="23"
-                /><label><input type="checkbox"
-                  class="checkBox"
-                  var:selection="checkForConflicts"
-                  var:checked="checkForConflicts"
-                  /><var:string label:value="check for conflicts"
-                  /></label></span></span>
+                /></span></span>
           <hr />
           <!-- label id="isPrivate"><input class="checkBox"
           type="checkbox" var:selection="isPrivate"