diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index dce4f268f..b768ea92f 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -761,8 +761,8 @@ Default value is `0`, or disabled. |S |SOGoMessageSubmissionBlockInterval |Number of seconds, default to `300` (or 5 minutes). Note that -_SOGoCacheCleanupInterval_ must be set to a value equal or higher than -_SOGoFailedLoginBlockInterval_. +_SOGoMessageSubmissionBlockInterval_ must be set to a value equal or lower than +_SOGoCacheCleanupInterval_. |S |SOGoMaximumRequestCount |Parameter used to control the number of requests a user can send to the SOGo diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index 0b10a148a..e215fd906 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -448,7 +448,7 @@ "Mark as Unread" = "Marquer comme non-lu"; "Mark as Read" = "Marquer comme lu"; "Closing Window ..." = "Fermer la fenêtre..."; -"Tried to send too many mails. Please wait." = "Vous avez envoyé trop de courriels. Veillez patienter."; +"Tried to send too many mails. Please wait." = "Vous avez envoyé trop de courriels. Veuillez patienter."; "View Mail" = "Voir le courriel"; "This message contains external images." = "Ce message contient des images externes."; "Expanded" = "Ouvert"; diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index a03e7901e..a71fe1517 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -866,7 +866,7 @@ static NSArray *infoKeys = nil; [self labelForKey: @"Tried to send too many mails. Please wait."], @"message", nil]; - return [self responseWithStatus: 200 + return [self responseWithStatus: 405 andString: [jsonResponse jsonRepresentation]]; }