diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_addressbook.php | 2 | ||||
| -rw-r--r-- | program/localization/en_GB/messages.inc | 4 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index e43f53526..399f84fd8 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1136,8 +1136,8 @@ class rcube * - code: Error code (required) * - type: Error type [php|db|imap|javascript] (required) * - message: Error message - * - file: File where error occured - * - line: Line where error occured + * - file: File where error occurred + * - line: Line where error occurred * @param boolean True to log the error * @param boolean Terminate script execution */ diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php index 9301211ff..6e2b439d8 100644 --- a/program/lib/Roundcube/rcube_addressbook.php +++ b/program/lib/Roundcube/rcube_addressbook.php @@ -134,7 +134,7 @@ abstract class rcube_addressbook abstract function get_record($id, $assoc=false); /** - * Returns the last error occured (e.g. when updating/inserting failed) + * Returns the last error occurred (e.g. when updating/inserting failed) * * @return array Hash array with the following fields: type, message */ diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index bba70b148..9509451ed 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -17,7 +17,7 @@ */ $messages = array(); -$messages['errortitle'] = 'An error occured.'; +$messages['errortitle'] = 'An error occurred.'; $messages['loginfailed'] = 'Login failed.'; $messages['cookiesdisabled'] = 'Your browser does not accept cookies.'; $messages['sessionerror'] = 'Your session is invalid or has expired.'; @@ -144,7 +144,7 @@ $messages['smtperror'] = 'SMTP Error: $msg'; $messages['emailformaterror'] = 'Incorrect e-mail address: $email'; $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.'; -$messages['internalerror'] = 'An internal error occured. Please try again.'; +$messages['internalerror'] = 'An internal error occurred. Please try again.'; $messages['contactdelerror'] = 'Could not delete contact(s).'; $messages['contactdeleted'] = 'Contact(s) deleted successfully.'; $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 47b0f797d..9733109ad 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -56,8 +56,8 @@ $messages['contactnotfound'] = 'The requested contact was not found.'; $messages['contactsearchonly'] = 'Enter some search terms to find contacts'; $messages['sendingfailed'] = 'Failed to send message.'; $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.'; -$messages['errorsavingsent'] = 'An error occured while saving sent message.'; -$messages['errorsaving'] = 'An error occured while saving.'; +$messages['errorsavingsent'] = 'An error occurred while saving sent message.'; +$messages['errorsaving'] = 'An error occurred while saving.'; $messages['errormoving'] = 'Could not move the message(s).'; $messages['errorcopying'] = 'Could not copy the message(s).'; $messages['errordeleting'] = 'Could not delete the message(s).'; @@ -144,7 +144,7 @@ $messages['smtperror'] = 'SMTP Error: $msg'; $messages['emailformaterror'] = 'Invalid e-mail address: $email'; $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.'; -$messages['internalerror'] = 'An internal error occured. Please try again.'; +$messages['internalerror'] = 'An internal error occurred. Please try again.'; $messages['contactdelerror'] = 'Could not delete contact(s).'; $messages['contactdeleted'] = 'Contact(s) deleted successfully.'; $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).'; |