banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typo: occured -> occurred (#1489366)

Browse Source 
Conflicts:

	CHANGELOG
	installer/rcube_install.php
pull/133/head
Aleksander Machniak 11 years ago
parent bdc515d35c
commit 57b44d2339
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -260,4 +260,3 @@ RELEASE 0.9-beta
Unified global functions naming (rcube_ prefix) Unified global functions naming (rcube_ prefix)
Better classes separation Better classes separation
Framework files moved to lib/Roundcube Framework files moved to lib/Roundcube

2
installer/rcube_install.php
Unescape Escape View File

@ -359,7 +359,7 @@ class rcube_install
* required for this version of Roundcube * required for this version of Roundcube
* *
* @param boolean True if the schema schould be updated * @param boolean True if the schema schould be updated
* @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, $update = false) function db_schema_check($DB, $update = false)
{ {

18
plugins/managesieve/localization/en_US.inc
Unescape Escape View File

@ -141,31 +141,31 @@ $labels['asciinumeric'] = 'numeric (ascii-numeric)';
$messages = array(); $messages = array();
$messages['filterunknownerror'] = 'Unknown server error.'; $messages['filterunknownerror'] = 'Unknown server error.';
$messages['filterconnerror'] = 'Unable to connect to server.'; $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['filterdeleted'] = 'Filter deleted successfully.';
$messages['filtersaved'] = 'Filter saved 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['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?'; $messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?'; $messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
$messages['forbiddenchars'] = 'Forbidden characters in field.'; $messages['forbiddenchars'] = 'Forbidden characters in field.';
$messages['cannotbeempty'] = 'Field cannot be empty.'; $messages['cannotbeempty'] = 'Field cannot be empty.';
$messages['ruleexist'] = 'Filter with specified name already exists.'; $messages['ruleexist'] = 'Filter with specified name already exists.';
$messages['setactivateerror'] = 'Unable to activate 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 occured.'; $messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.';
$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.'; $messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.';
$messages['setactivated'] = 'Filters set activated successfully.'; $messages['setactivated'] = 'Filters set activated successfully.';
$messages['setdeactivated'] = 'Filters set deactivated successfully.'; $messages['setdeactivated'] = 'Filters set deactivated successfully.';
$messages['setdeleted'] = 'Filters set deleted successfully.'; $messages['setdeleted'] = 'Filters set deleted successfully.';
$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?'; $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['setcreated'] = 'Filters set created successfully.';
$messages['activateerror'] = 'Unable to enable 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 occured.'; $messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.';
$messages['deactivated'] = 'Filter(s) disabled successfully.'; $messages['deactivated'] = 'Filter(s) disabled successfully.';
$messages['activated'] = 'Filter(s) enabled successfully.'; $messages['activated'] = 'Filter(s) enabled successfully.';
$messages['moved'] = 'Filter moved 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['nametoolong'] = 'Name too long.';
$messages['namereserved'] = 'Reserved name.'; $messages['namereserved'] = 'Reserved name.';
$messages['setexist'] = 'Set already exists.'; $messages['setexist'] = 'Set already exists.';

4
program/lib/Roundcube/rcube.php
Unescape Escape View File

@ -1069,8 +1069,8 @@ class rcube
* - code: Error code (required) * - code: Error code (required)
* - type: Error type [php|db|imap|javascript] (required) * - type: Error type [php|db|imap|javascript] (required)
* - message: Error message * - message: Error message
* - file: File where error occured * - file: File where error occurred
* - line: Line where error occured * - line: Line where error occurred
* @param boolean True to log the error * @param boolean True to log the error
* @param boolean Terminate script execution * @param boolean Terminate script execution
*/ */

2
program/lib/Roundcube/rcube_addressbook.php
Unescape Escape View File

@ -133,7 +133,7 @@ abstract class rcube_addressbook
abstract function get_record($id, $assoc=false); 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 * @return array Hash array with the following fields: type, message
*/ */

4
program/localization/en_GB/messages.inc
Unescape Escape View File

@ -17,7 +17,7 @@
*/ */
$messages = array(); $messages = array();
$messages['errortitle'] = 'An error occured.'; $messages['errortitle'] = 'An error occurred.';
$messages['loginfailed'] = 'Login failed.'; $messages['loginfailed'] = 'Login failed.';
$messages['cookiesdisabled'] = 'Your browser does not accept cookies.'; $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
$messages['sessionerror'] = 'Your session is invalid or has expired.'; $messages['sessionerror'] = 'Your session is invalid or has expired.';
@ -139,7 +139,7 @@ $messages['smtperror'] = 'SMTP Error: $msg';
$messages['emailformaterror'] = 'Incorrect e-mail address: $email'; $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $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['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['contactdelerror'] = 'Could not delete contact(s).';
$messages['contactdeleted'] = 'Contact(s) deleted successfully.'; $messages['contactdeleted'] = 'Contact(s) deleted successfully.';
$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).'; $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';

6
program/localization/en_US/messages.inc
Unescape Escape View File

@ -54,8 +54,8 @@ $messages['contactnotfound'] = 'The requested contact was not found.';
$messages['contactsearchonly'] = 'Enter some search terms to find contacts'; $messages['contactsearchonly'] = 'Enter some search terms to find contacts';
$messages['sendingfailed'] = 'Failed to send message.'; $messages['sendingfailed'] = 'Failed to send message.';
$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.'; $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
$messages['errorsavingsent'] = 'An error occured while saving sent message.'; $messages['errorsavingsent'] = 'An error occurred while saving sent message.';
$messages['errorsaving'] = 'An error occured while saving.'; $messages['errorsaving'] = 'An error occurred while saving.';
$messages['errormoving'] = 'Could not move the message(s).'; $messages['errormoving'] = 'Could not move the message(s).';
$messages['errorcopying'] = 'Could not copy the message(s).'; $messages['errorcopying'] = 'Could not copy the message(s).';
$messages['errordeleting'] = 'Could not delete the message(s).'; $messages['errordeleting'] = 'Could not delete the message(s).';
@ -137,7 +137,7 @@ $messages['smtperror'] = 'SMTP Error: $msg';
$messages['emailformaterror'] = 'Invalid e-mail address: $email'; $messages['emailformaterror'] = 'Invalid e-mail address: $email';
$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $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['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['contactdelerror'] = 'Could not delete contact(s).';
$messages['contactdeleted'] = 'Contact(s) deleted successfully.'; $messages['contactdeleted'] = 'Contact(s) deleted successfully.';
$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).'; $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';

Write Preview
Loading…
Cancel
Save