Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-01-09 12:22:11 +01:00
commit ff3c4c0816
3 changed files with 3 additions and 3 deletions

View File

@ -98,7 +98,7 @@ class PMA_PDF extends TCPDF
}
/**
* Improved with alias expading.
* Improved with alias expanding.
*
* @return void
*/

View File

@ -130,7 +130,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
$rightDescriptionTitle = '';
} else {
$rightDescriptionTitle = htmlspecialchars(
$rightDescriptionTitle
$rightDescription
);
$rightDescription = htmlspecialchars(
$pmaString->substr(

View File

@ -65,7 +65,7 @@ function PMA_gzencodeNeeded()
/**
* Output handler for all exports, if needed buffering, it stores data into
* $dump_buffer, otherwise it prints thems out.
* $dump_buffer, otherwise it prints them out.
*
* @param string $line the insert statement
*