diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index f4ece14de..21937c540 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -443,7 +443,7 @@ us = [user userSettings]; moduleSettings = [us objectForKey:@"Calendar"]; - // Check if the user prevented his account from beeing invited to events + // Check if the user prevented their account from beeing invited to events if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue]) { // Check if the user have a whiteList @@ -1093,7 +1093,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent else { // We must REMOVE any SENT-BY here. This is important since if A accepted - // the event for B and then, B changes by himself his participation status, + // the event for B and then, B changes by theirself their participation status, // we don't want to keep the previous SENT-BY attribute there. [(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"]; } @@ -1191,7 +1191,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent else { // We must REMOVE any SENT-BY here. This is important since if A accepted - // the event for B and then, B changes by himself his participation status, + // the event for B and then, B changes by theirself their participation status, // we don't want to keep the previous SENT-BY attribute there. [(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"]; } @@ -1208,7 +1208,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent delegatedUID = [otherDelegate uid]; if (delegatedUID) - // Delegate attendee is a local user; remove event from his calendar + // Delegate attendee is a local user; remove event from their calendar [self _removeEventFromUID: delegatedUID owner: [theOwnerUser login] withRecurrenceId: [event recurrenceId]]; @@ -1240,7 +1240,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent [event addToAttendees: delegate]; if (delegatedUID) - // Delegate attendee is a local user; add event to his calendar + // Delegate attendee is a local user; add event to their calendar [self _addOrUpdateEvent: event forUID: delegatedUID owner: [theOwnerUser login]]; diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index f8822c061..ce600715b 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -644,8 +644,8 @@ // As much as we can, we try to use c_name == c_uid in order // to avoid tricky scenarios with some CalDAV clients. For example, // if Alice invites Bob (both use SOGo) and Bob accepts the invitation - // using Lightning before having refreshed his calendar, he'll end up - // with a duplicate of the event in his database tables. + // using Lightning before having refreshed their calendar, they'll end up + // with a duplicate of the event in their database tables. if (isNew) { newUid = nameInContainer; diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 921d312c0..ac43d1529 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -302,7 +302,7 @@ static NSArray *childRecordFields = nil; } /* This method fetches the display name defined by the owner, but is also the - fallback when a subscriber has not redefined the display name yet in his + fallback when a subscriber has not redefined the display name yet in their environment. */ - (NSString *) _displayNameFromOwner { @@ -895,7 +895,7 @@ static NSArray *childRecordFields = nil; allUsers = [NSMutableArray arrayWithArray: [aGroup members]]; // We remove the active user from the group (if present) in order to - // not subscribe him to his own resource! + // not subscribe him to their own resource! [allUsers removeObject: [context activeUser]]; } else diff --git a/SoObjects/SOGo/SOGoUserFolder.h b/SoObjects/SOGo/SOGoUserFolder.h index 4ee6bdd65..0621728a7 100644 --- a/SoObjects/SOGo/SOGoUserFolder.h +++ b/SoObjects/SOGo/SOGoUserFolder.h @@ -31,7 +31,7 @@ Child objects: 'Calendar': SOGoAppointmentFolder - The SOGoUserFolder is the "home directory" of the user where all his + The SOGoUserFolder is the "home directory" of the user where all their processing starts. It is the 'znek' in such a path: /SOGo/so/znek/Calendar */ diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index d8e32c1db..df3e944b1 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -361,7 +361,7 @@ if (login) { - /* We redirect the user to his "homepage" when newLocation could not be + /* We redirect the user to their "homepage" when newLocation could not be deduced from the "cas-location" cookie and the current action is not a login callback (ticket != nil). */ if (!newLocation || !ticket) diff --git a/UI/Templates/SOGoACLDanishModificationAdvisory.wox b/UI/Templates/SOGoACLDanishModificationAdvisory.wox index 20b7dbb0a..929552839 100644 --- a/UI/Templates/SOGoACLDanishModificationAdvisory.wox +++ b/UI/Templates/SOGoACLDanishModificationAdvisory.wox @@ -12,7 +12,7 @@ - has modified your access rights for his folder. + has modified your access rights for their folder.