gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-10-03 17:25:29 +02:00
commit 10d879902a
20 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/error_report.js
View File

@ -118,7 +118,7 @@ var ErrorReport = {
);
html = '';
html += '<img src="themes/dot.gif" title="" alt="" class="icon ic_s_error">';
html += PMA_messages.strErrorOccured;
html += PMA_messages.strErrorOccurred;
$div.html(html);
$buttons = $('<div style="float:right"></div>');

4
js/messages.php
View File

@ -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");

2
js/server_status_advisor.js
View File

@ -47,7 +47,7 @@ AJAX.registerOnload('server_status_advisor.js', function () {
}
if (data.run.errors.length > 0) {
$cnt.append('<b>Errors occured while executing rule expressions:</b><br />- ');
$cnt.append('<b>Errors occurred while executing rule expressions:</b><br />- ');
$cnt.append(data.run.errors.join('<br/>- '));
$cnt.append('<p></p>');
}

2
libraries/DatabaseInterface.class.php
View File

@ -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
*

4
libraries/Error.class.php
View File

@ -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
*/

6
libraries/Error_Handler.class.php
View File

@ -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
*/

2
libraries/File.class.php
View File

@ -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()
{

4
libraries/RecentTable.class.php
View File

@ -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;
}
/**

2
libraries/Table.class.php
View File

@ -57,7 +57,7 @@ class PMA_Table
var $uiprefs;
/**
* @var array errors occured
* @var array errors occurred
*/
var $errors = array();

2
libraries/dbi/DBIDrizzle.class.php
View File

@ -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
*

2
libraries/dbi/DBIDummy.class.php
View File

@ -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
*

2
libraries/dbi/DBIExtension.int.php
View File

@ -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
*

2
libraries/dbi/DBIMysql.class.php
View File

@ -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
*

2
libraries/dbi/DBIMysqli.class.php
View File

@ -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
*

2
libraries/navigation/Navigation.class.php
View File

@ -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;

2
libraries/rte/rte_events.lib.php
View File

@ -172,7 +172,7 @@ function PMA_EVN_handleEditor()
}
if (count($errors)) {
$message = PMA_Message::error(__('<b>One or more errors have occured while processing your request:</b>'));
$message = PMA_Message::error(__('<b>One or more errors have occurred while processing your request:</b>'));
$message->addString('<ul>');
foreach ($errors as $string) {
$message->addString('<li>' . $string . '</li>');

2
libraries/rte/rte_main.inc.php
View File

@ -68,7 +68,7 @@ $ajax_class = array(
$titles = PMA_Util::buildActionTitles();
/**
* Keep a list of errors that occured while
* Keep a list of errors that occurred while
* processing an 'Add' or 'Edit' operation.
*/
$errors = array();

2
libraries/rte/rte_routines.lib.php
View File

@ -368,7 +368,7 @@ function PMA_RTN_handleEditor()
if (count($errors)) {
$message = PMA_Message::error(
__(
'<b>One or more errors have occured while'
'<b>One or more errors have occurred while'
. ' processing your request:</b>'
)
);

2
libraries/rte/rte_triggers.lib.php
View File

@ -144,7 +144,7 @@ function PMA_TRI_handleEditor()
}
if (count($errors)) {
$message = PMA_Message::error(__('<b>One or more errors have occured while processing your request:</b>'));
$message = PMA_Message::error(__('<b>One or more errors have occurred while processing your request:</b>'));
$message->addString('<ul>');
foreach ($errors as $string) {
$message->addString('<li>' . $string . '</li>');

4
libraries/tbl_columns_definition_form.lib.php
View File

@ -364,7 +364,7 @@ function PMA_getMoveColumns($db, $table)
}
/**
* Function to get row data for regenerating previous when error occured.
* Function to get row data for regenerating previous when error occurred.
*
* @param int $columnNumber coulmn number
* @param array $submit_fulltext submit full text
@ -444,7 +444,7 @@ function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
}
/**
* Function to get submit properties for regenerating previous when error occured.
* Function to get submit properties for regenerating previous when error occurred.
*
* @param int $columnNumber coulmn number
*