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 2014-01-06 13:05:24 +01:00
commit 4c6458798c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DisplayResults.class.php
View File

@ -4534,7 +4534,7 @@ class PMA_DisplayResults
$pre_count = '~';
$after_count = PMA_Util::showHint(
PMA_sanitize(
__('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]')
__('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc].')
)
);
} else {
@ -6041,7 +6041,7 @@ class PMA_DisplayResults
}
/**
* Display binary columns as hex string if requested
* Display binary columns as hex string if requested
* otherwise escape the contents using the best possible way
*
* @param string $content String to parse

2
libraries/structure.lib.php
View File

@ -768,7 +768,7 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false)
.'<th>' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC')
. PMA_Util::showHint(
PMA_sanitize(
__('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]')
__('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc].')
)
) . "\n"
.'</th>' . "\n";