Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-06-08 08:40:08 +02:00
commit ebe59195b4

View File

@ -426,6 +426,7 @@ $PMA_SQPdata_reserved_word = array (
'DAY_HOUR',
'DAY_MINUTE',
'DAY_SECOND',
'DECLARE',
'DEFINER',
'DELAYED',
'DELAY_KEY_WRITE',
@ -1316,6 +1317,7 @@ $PMA_SQPdata_functions_docs = array(
'DAYOFMONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofmonth'),
'DAYOFWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofweek'),
'DAYOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofyear'),
'DECLARE' => array('link' => 'declare', 'anchor' => 'declare'),
'DECODE' => array('link' => 'encryption-functions','anchor' => 'function_decode'),
'DEFAULT' => array('link' => 'miscellaneous-functions','anchor' => 'function_default'),
'DEGREES' => array('link' => 'mathematical-functions','anchor' => 'function_degrees'),