diff --git a/js/error_report.js b/js/error_report.js index 2b058e208a..6097009431 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -118,7 +118,7 @@ var ErrorReport = { ); html = ''; html += ''; - html += PMA_messages.strErrorOccured; + html += PMA_messages.strErrorOccurred; $div.html(html); $buttons = $('
'); diff --git a/js/messages.php b/js/messages.php index 920c16a130..fe5c1ee34a 100644 --- a/js/messages.php +++ b/js/messages.php @@ -395,8 +395,8 @@ $js_messages['strCreateView'] = __('Create view'); /* Error Reporting */ $js_messages['strSendErrorReport'] = __("Send Error Report"); $js_messages['strSubmitErrorReport'] = __("Submit Error Report"); -$js_messages['strErrorOccured'] = __( - "An error has occured. Do you want to send an error report?" +$js_messages['strErrorOccurred'] = __( + "An error has occurred. Do you want to send an error report?" ); $js_messages['strChangeReportSettings'] = __("Change Report Settings"); $js_messages['strShowReportDetails'] = __("Show Report Details"); diff --git a/js/server_status_advisor.js b/js/server_status_advisor.js index 2aba1fb15d..eb1a5f89fb 100644 --- a/js/server_status_advisor.js +++ b/js/server_status_advisor.js @@ -47,7 +47,7 @@ AJAX.registerOnload('server_status_advisor.js', function () { } if (data.run.errors.length > 0) { - $cnt.append('Errors occured while executing rule expressions:
- '); + $cnt.append('Errors occurred while executing rule expressions:
- '); $cnt.append(data.run.errors.join('
- ')); $cnt.append('

'); } diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 87104b3e2b..2fbf9ddb42 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -2296,7 +2296,7 @@ class PMA_DatabaseInterface } /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param object $link connection link * diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 3874769eb3..5dfc3b9e40 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -67,14 +67,14 @@ class PMA_Error extends PMA_Message ); /** - * The file in which the error occured + * The file in which the error occurred * * @var string */ protected $file = ''; /** - * The line in which the error occured + * The line in which the error occurred * * @var integer */ diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 3bad9b8333..d5752d44a4 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -106,7 +106,7 @@ class PMA_Error_Handler } /** - * Error handler - called when errors are triggered/occured + * Error handler - called when errors are triggered/occurred * * This calls the addError() function, escaping the error string * @@ -404,7 +404,7 @@ class PMA_Error_Handler } /** - * whether use errors occured or not + * whether use errors occurred or not * * @return boolean */ @@ -414,7 +414,7 @@ class PMA_Error_Handler } /** - * whether errors occured or not + * whether errors occurred or not * * @return boolean */ diff --git a/libraries/File.class.php b/libraries/File.class.php index c0d1dfb56a..2f2e968bd6 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -379,7 +379,7 @@ class PMA_File * Checks whether there was any error. * * @access public - * @return boolean whether an error occured or not + * @return boolean whether an error occurred or not */ public function isError() { diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index f246b52238..5c2cc3fef4 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -141,11 +141,11 @@ class PMA_RecentTable public function trim() { $max = max($GLOBALS['cfg']['NumRecentTables'], 0); - $trimming_occured = count($this->tables) > $max; + $trimming_occurred = count($this->tables) > $max; while (count($this->tables) > $max) { array_pop($this->tables); } - return $trimming_occured; + return $trimming_occurred; } /** diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 85446c685a..13a1ea3d61 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -57,7 +57,7 @@ class PMA_Table var $uiprefs; /** - * @var array errors occured + * @var array errors occurred */ var $errors = array(); diff --git a/libraries/dbi/DBIDrizzle.class.php b/libraries/dbi/DBIDrizzle.class.php index 68eeec64a6..82293d9da3 100644 --- a/libraries/dbi/DBIDrizzle.class.php +++ b/libraries/dbi/DBIDrizzle.class.php @@ -367,7 +367,7 @@ class PMA_DBI_Drizzle implements PMA_DBI_Extension } /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param PMA_DrizzleCon $link connection object * diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index 1aeefac4f6..eadac40199 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -745,7 +745,7 @@ class PMA_DBI_Dummy implements PMA_DBI_Extension } /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param object $link connection link * diff --git a/libraries/dbi/DBIExtension.int.php b/libraries/dbi/DBIExtension.int.php index 9cc743300b..2511e432f1 100644 --- a/libraries/dbi/DBIExtension.int.php +++ b/libraries/dbi/DBIExtension.int.php @@ -160,7 +160,7 @@ interface PMA_DBI_Extension public function getClientInfo(); /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param object $link connection link * diff --git a/libraries/dbi/DBIMysql.class.php b/libraries/dbi/DBIMysql.class.php index 41f3dcd98a..34f4d6a73d 100644 --- a/libraries/dbi/DBIMysql.class.php +++ b/libraries/dbi/DBIMysql.class.php @@ -375,7 +375,7 @@ class PMA_DBI_Mysql implements PMA_DBI_Extension } /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param resource $link mysql link * diff --git a/libraries/dbi/DBIMysqli.class.php b/libraries/dbi/DBIMysqli.class.php index 1b602741bf..31a389cb74 100644 --- a/libraries/dbi/DBIMysqli.class.php +++ b/libraries/dbi/DBIMysqli.class.php @@ -463,7 +463,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension } /** - * returns last error message or false if no errors occured + * returns last error message or false if no errors occurred * * @param resource $link mysql link * diff --git a/libraries/navigation/Navigation.class.php b/libraries/navigation/Navigation.class.php index 071ae4c22c..9821f0822e 100644 --- a/libraries/navigation/Navigation.class.php +++ b/libraries/navigation/Navigation.class.php @@ -58,7 +58,7 @@ class PMA_Navigation if (! $treeRender) { $retval .= PMA_Message::error( - __('An error has occured while loading the navigation tree') + __('An error has occurred while loading the navigation tree') )->getDisplay(); } else { $retval .= $treeRender; diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index f8f34f77b7..77065970f2 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -172,7 +172,7 @@ function PMA_EVN_handleEditor() } if (count($errors)) { - $message = PMA_Message::error(__('One or more errors have occured while processing your request:')); + $message = PMA_Message::error(__('One or more errors have occurred while processing your request:')); $message->addString('