diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | installer/rcube_install.php | 2 | ||||
| -rw-r--r-- | plugins/managesieve/localization/en_US.inc | 18 | ||||
| -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 |
7 files changed, 19 insertions, 19 deletions
@@ -1390,7 +1390,7 @@ RELEASE 0.2-STABLE - Allow deleting identities when multiple_identities=false (#1485435) - Added option focus_on_new_message (#1485374) - Fix html2text class autoloading on Windows (#1485505) -- Fix html signature formatting when identity save error occured (#1485426) +- Fix html signature formatting when identity save error occurred (#1485426) - Add feedback and set busy when moving folder (#1485497) - Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489) - Fix messages count bar overlapping (#1485270) diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 9c9794cc2..df05db493 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -406,7 +406,7 @@ class rcube_install * * @param rcube_db Database object * - * @return boolean True if the schema is up-to-date, false if not or an error occured + * @return boolean True if the schema is up-to-date, false if not or an error occurred */ function db_schema_check($DB) { diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc index 675b941b4..cbe69dc9f 100644 --- a/plugins/managesieve/localization/en_US.inc +++ b/plugins/managesieve/localization/en_US.inc @@ -163,31 +163,31 @@ $labels['indexlast'] = 'backwards'; $messages = array(); $messages['filterunknownerror'] = 'Unknown server error.'; $messages['filterconnerror'] = 'Unable to connect to server.'; -$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.'; +$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.'; $messages['filterdeleted'] = 'Filter deleted successfully.'; $messages['filtersaved'] = 'Filter saved successfully.'; -$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.'; +$messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.'; $messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?'; $messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?'; $messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?'; $messages['forbiddenchars'] = 'Forbidden characters in field.'; $messages['cannotbeempty'] = 'Field cannot be empty.'; $messages['ruleexist'] = 'Filter with specified name already exists.'; -$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.'; -$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.'; -$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.'; +$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occurred.'; +$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.'; +$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.'; $messages['setactivated'] = 'Filters set activated successfully.'; $messages['setdeactivated'] = 'Filters set deactivated successfully.'; $messages['setdeleted'] = 'Filters set deleted successfully.'; $messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?'; -$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.'; +$messages['setcreateerror'] = 'Unable to create filters set. Server error occurred.'; $messages['setcreated'] = 'Filters set created successfully.'; -$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.'; -$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.'; +$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occurred.'; +$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.'; $messages['deactivated'] = 'Filter(s) disabled successfully.'; $messages['activated'] = 'Filter(s) enabled successfully.'; $messages['moved'] = 'Filter moved successfully.'; -$messages['moveerror'] = 'Unable to move selected filter. Server error occured.'; +$messages['moveerror'] = 'Unable to move selected filter. Server error occurred.'; $messages['nametoolong'] = 'Name too long.'; $messages['namereserved'] = 'Reserved name.'; $messages['setexist'] = 'Set already exists.'; 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).'; |