Merge conflict resolved for Lori's tree merge to main

This commit is contained in:
ninadsp
2010-08-22 12:42:54 +05:30
144 changed files with 81403 additions and 55891 deletions

View File

@@ -38,7 +38,7 @@ $js_messages['strOperationTakesLongTime'] = __('This operation could take a long
/* For blobstreaming */
$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!');
$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), $GLOBALS['db']);
$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), PMA_escapeJsString($GLOBALS['db']));
/* For indexes */
$js_messages['strFormEmpty'] = __('Missing value in the form!');