git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1237 d1b88da0-ebda-0310...

diff --git a/UI/Common/UIxObjectActions.m b/UI/Common/UIxObjectActions.m
index d36ebc32d49f09152b5d0728a6dd908ca63ef2fb..05dd40a2c238f7cd943b03c5f74c6eeb434af451 100644 (file)
--- a/UI/Common/UIxObjectActions.m
+++ b/UI/Common/UIxObjectActions.m
@@ -20,8 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
+
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -40,7 +42,7 @@ static BOOL sendACLAdvisories = NO;
   NSUserDefaults *ud;
 
   ud = [NSUserDefaults standardUserDefaults];
-  sendACLAdvistories = [ud boolForKey: @"SOGoACLsSendEMailNotifications"];
+  sendACLAdvisories = [ud boolForKey: @"SOGoACLsSendEMailNotifications"];
 }
 
 - (WOResponse *) addUserInAclsAction
@@ -63,7 +65,7 @@ static BOOL sendACLAdvisories = NO;
          clientObject = [self clientObject];
          [clientObject setRoles: [clientObject aclsForUser: uid]
                        forUser: uid];
-         if (sendACLAdvistories)
+         if (sendACLAdvisories)
            [clientObject sendACLAdditionAdvisoryToUser: uid];
           code = 204;
         }
@@ -94,7 +96,7 @@ static BOOL sendACLAdvisories = NO;
        {
          co = [self clientObject];
          [co removeAclsForUsers: [NSArray arrayWithObject: uid]];
-         if (sendACLAdvistories)
+         if (sendACLAdvisories)
            [co sendACLRemovalAdvisoryToUser: uid];
           code = 204;
         }

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 0ce7d868f7ee4c7b054a4728eb353c1048e77a15..0324d2af2f362037ba50f3213503f9c59df79eb5 100644 (file)
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -376,8 +376,8 @@ validate_endbeforestart    = "Enddate is before startdate!";
 "Workweek days only" = "Workweek days only";
 "Tasks in View" = "Tasks in View";
 
-"eventDeleteConfirmation" = "Erasing this event will be permanent.\\nWould you like to continue?";
-"taskDeleteConfirmation" = "Erasing this task will be permanent.\\nWould you like to continue?";
+"eventDeleteConfirmation" = "Erasing this event will be permanent.\nWould you like to continue?";
+"taskDeleteConfirmation" = "Erasing this task will be permanent.\nWould you like to continue?";
 
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "Are you sure you want to delete the calendar \"%{0}\"?";

diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 1c69351f332dfb4a1a5fb8cbe61d8b45eb9355bb..7acc16cadc51593239e9689bc043567f6184cb5e 100644 (file)
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -374,8 +374,8 @@ validate_endbeforestart    = "La date de fin est avant la date de début !";
 "Workweek days only" = "Semaine de travail seulement";
 "Tasks in View" = "Afficher les tâches";
 
-"eventDeleteConfirmation" = "L'effacement de cet événement sera permanent.\\nVoulez-vous continuer?";
-"taskDeleteConfirmation" = "L'effacement de cette tâche sera permanent.\\nVoulez-vous continuer?";
+"eventDeleteConfirmation" = "L'effacement de cet événement sera permanent.\nVoulez-vous continuer?";
+"taskDeleteConfirmation" = "L'effacement de cette tâche sera permanent.\nVoulez-vous continuer?";
 
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "Voulez-vous vraiment supprimer l'agenda «%{0}»?";

diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index e3ea85ee5b16f5c83717f4a6447bcfdca25e6ce5..ff8d2f003150583fdd940fede150a46b9859b6bb 100644 (file)
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -363,8 +363,8 @@ validate_endbeforestart    = "Ihr Beginn ist nach dem Ende";
 "Workweek days only" = "Semaine de travail seulement";
 "Tasks in View" = "Afficher les tâches";
 
-"eventDeleteConfirmation" = "L'effacement de cet événement sera permanent.\\nVoulez-vous continuer?";
-"taskDeleteConfirmation" = "L'effacement de cette tâche sera permanent.\\nVoulez-vous continuer?";
+"eventDeleteConfirmation" = "L'effacement de cet événement sera permanent.\nVoulez-vous continuer?";
+"taskDeleteConfirmation" = "L'effacement de cette tâche sera permanent.\nVoulez-vous continuer?";
 
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "Are you sure you want to delete the calendar \"%{0}\"?";