From f13bed3a1ec7f660cce0141d143785427424915f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 21 Mar 2007 14:29:31 +0000
Subject: [PATCH] Monotone-Parent: fd0f517e16d123b59c1eef87df8ba3ec2fe3fa56
 Monotone-Revision: ee357f4b9d019fa34ff7f3951f8a7becf88fba19

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-03-21T14:29:31
Monotone-Branch: ca.inverse.sogo
---
 .../English.lproj/Localizable.strings         |  1 +
 UI/Scheduler/French.lproj/Localizable.strings |  1 +
 .../Toolbars/SOGoComponentClose.toolbar       |  4 ++--
 UI/Scheduler/UIxAppointmentEditor.m           | 20 +++++++++----------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 2a97ad70b..aa881ef13 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -91,6 +91,7 @@
 "delete" = "Delete";
 "proposal" = "Proposal";
 "Save and Close" = "Save and Close";
+"Close" = "Close";
 "Invite Attendees" = "Invite Attendees";
 "Documents" = "Documents";
 "Cancel" = "Cancel";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 187fef43d..adb78b5d2 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -91,6 +91,7 @@
 "delete" = "Supprimer";
 "proposal" = "Recherche de plages horaires";
 "Save and Close" = "Enregistrer et fermer";
+"Close" = "Fermer";
 "Invite Attendees" = "Participants";
 "Documents" = "Documents";
 "Cancel" = "Annuler";
diff --git a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
index 8171adf3c..571e1f6a0 100644
--- a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
@@ -1,7 +1,7 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
       isSafe = NO;
-      label = "Cancel";
+      label = "Close";
       onclick = "window.close(); return false;";
-      image = "tb-ab-delete-flat-24x24.png"; } )
+      image = "tb-mail-stop-flat-24x24.png"; } )
 )
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index cbf5af293..17c12eaaa 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -363,16 +363,6 @@
     [event setTransparency: @"OPAQUE"];
 }
 
-- (id) acceptAction
-{
-  return [self acceptOrDeclineAction:YES];
-}
-
-- (id) declineAction
-{
-  return [self acceptOrDeclineAction:NO];
-}
-
 // TODO: add tentatively
 
 - (id) acceptOrDeclineAction: (BOOL) _accept
@@ -384,4 +374,14 @@
   return self;
 }
 
+- (id) acceptAction
+{
+  return [self acceptOrDeclineAction:YES];
+}
+
+- (id) declineAction
+{
+  return [self acceptOrDeclineAction:NO];
+}
+
 @end