diff --git a/ChangeLog b/ChangeLog
index 606903427..f98cb4463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxAppointmentEditor.m: invoke
+	"stringByEscapingHTMLString" on the resulting value to avoid
+	issues with accented characters.
+	([-jsCode]): removed method since the javascript code was merged
+	into SchedulerUI.js.
+
 2006-08-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/iCalPerson+UIx.m ([iCalPerson +personWithUid:]):
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index f66401805..1adcbd466 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -209,7 +209,7 @@
 /* Appointment categories */
 
 "APPOINTMENT"		= "Rendez-vous";
-"NOT IN OFFICE"		= "A l'exterieur";
+"NOT IN OFFICE"		= "A l'extérieur";
 "MEETING"		= "Réunion";
 "HOLIDAY"		= "Vacances";
 "PHONE CALL"		= "Rendez-vous téléphonique";
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 80aec0da1..514612d11 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 /* TODO: CLEAN UP */
 
@@ -277,13 +277,14 @@
   return categoryItems;
 }
 
-- (NSString *)itemCategoryText {
-  return [self labelForKey: self->item];
+- (NSString *) itemCategoryText {
+  return [[self labelForKey: self->item] stringByEscapingHTMLString];
 }
 
 - (void)setCategories:(NSArray *)_categories {
   ASSIGN(self->categories, _categories);
 }
+
 - (NSArray *)categories {
   return self->categories;
 }
@@ -917,31 +918,6 @@
 
 /* response generation */
 
-- (NSString *)jsCode {
-  static NSString *script = \
-  @"function showElement(e, show) {\n"
-  @"	e.style.visibility = show ? 'visible' : 'hidden';\n"
-  @"}\n"
-  @"\n"
-  @"function selectHasCycle(sender) {\n"
-  @"  var value = sender.selectedIndex;\n"
-  @"  var show  = (value != 0);\n"
-  @"  var sel   = document.getElementById('cycle_end_mode_selection');"
-  @"  this.showElement(document.getElementById('cycle_end_label'), show);\n"
-  @"  this.showElement(document.getElementById('cycle_end_mode'),  show);\n"
-  @"  this.selectCycleEnd(sel);\n"
-  @"}\n"
-  @"function selectCycleEnd(sender) {\n"
-  @"  var cycleEndUntil = document.getElementById('cycle_end_until');\n"
-  @"  var value = sender.options[sender.selectedIndex].value;\n"
-  @"  var show  = (value == 'cycle_end_until');\n"
-  @"  this.showElement(cycleEndUntil, show);\n"
-  @"}\n"
-  @"\n";
-
-  return script;
-}
-
 - (NSString *)initialCycleVisibility {
   if (![self hasCycle])
     return @"visibility: hidden;";