merge of '1a7fb070202750af8cc8edfa2a6ffba467b2b25b'

and 'a8d7706d1697aa0016456102e8d0198a8f7ef74d'

Monotone-Parent: 1a7fb070202750af8cc8edfa2a6ffba467b2b25b
Monotone-Parent: a8d7706d1697aa0016456102e8d0198a8f7ef74d
Monotone-Revision: df60fa1b39b724d3f0ecdfb7868bc7d84cf4b614

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-11-15T22:41:21
Monotone-Branch: ca.inverse.sogo

UI/PreferencesUI/German.lproj/Localizable.strings

@@ -184,7 +184,7 @@
 
 /* Return receipts */
 "When I receive a request for a return receipt:" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte:";
-"Never send a return receipt" = "Niemals eine Beatätigung senden";
+"Never send a return receipt" = "Niemals eine Bestätigung senden";
 "Allow return receipts for some messages" = "Erlaube eine Bestätigung für einige Nachrichten";
 "If I'm not in the To or Cc of the message:" = "Wenn ich nicht in An oder Cc der Nachricht bin:";
 "If the sender is outside my domain:" = "Wenn der Absender außerhalb meiner Domain ist:";

UI/Scheduler/UIxAppointmentEditor.m

@@ -375,7 +375,9 @@
 
   if ([co isNew])
     {
-      if (componentCalendar && componentCalendar != previousCalendar)
+      if (componentCalendar
+          && ![[componentCalendar ocsPath]
+                isEqualToString: [previousCalendar ocsPath]])
 	{
 	  // New event in a different calendar -- make sure the user can
 	  // write to the selected calendar since the rights were verified
@@ -397,7 +399,9 @@
       // The event was modified -- save it.
       [co saveComponent: event];
 
-      if (componentCalendar && componentCalendar != previousCalendar)
+      if (componentCalendar
+          && ![[componentCalendar ocsPath]
+                isEqualToString: [previousCalendar ocsPath]])
 	{
 	  // The event was moved to a different calendar.
 	  if (![sm validatePermission: SoPerm_DeleteObjects