Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8b47da1069
@ -350,12 +350,12 @@ function PMA_getGrantsArray()
|
||||
array(
|
||||
'Event_priv',
|
||||
'EVENT',
|
||||
__('Allows to set up events for the event scheduler')
|
||||
__('Allows to set up events for the event scheduler.')
|
||||
),
|
||||
array(
|
||||
'Trigger_priv',
|
||||
'TRIGGER',
|
||||
__('Allows creating and dropping triggers')
|
||||
__('Allows creating and dropping triggers.')
|
||||
),
|
||||
// for table privs:
|
||||
array(
|
||||
@ -1120,11 +1120,11 @@ function PMA_getStructurePrivilegeTable($table, $row)
|
||||
// MySQL 5.1.6
|
||||
$structure_privTable[] = array('Event',
|
||||
'EVENT',
|
||||
__('Allows to set up events for the event scheduler')
|
||||
__('Allows to set up events for the event scheduler.')
|
||||
);
|
||||
$structure_privTable[] = array('Trigger',
|
||||
'TRIGGER',
|
||||
__('Allows creating and dropping triggers')
|
||||
__('Allows creating and dropping triggers.')
|
||||
);
|
||||
}
|
||||
return $structure_privTable;
|
||||
|
||||
@ -68,7 +68,7 @@ $strPrivDescCreateView = __('Allows creating new views.');
|
||||
$strPrivDescDelete = __('Allows deleting data.');
|
||||
$strPrivDescDropDb = __('Allows dropping databases and tables.');
|
||||
$strPrivDescDropTbl = __('Allows dropping tables.');
|
||||
$strPrivDescEvent = __('Allows to set up events for the event scheduler');
|
||||
$strPrivDescEvent = __('Allows to set up events for the event scheduler.');
|
||||
$strPrivDescExecute = __('Allows executing stored routines.');
|
||||
$strPrivDescFile = __('Allows importing data from and exporting data into files.');
|
||||
$strPrivDescGrant = __(
|
||||
@ -108,7 +108,7 @@ $strPrivDescSuper = __(
|
||||
. 'required for most administrative operations like setting global variables '
|
||||
. 'or killing threads of other users.'
|
||||
);
|
||||
$strPrivDescTrigger = __('Allows creating and dropping triggers');
|
||||
$strPrivDescTrigger = __('Allows creating and dropping triggers.');
|
||||
$strPrivDescUpdate = __('Allows changing data.');
|
||||
$strPrivDescUsage = __('No privileges.');
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user