Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4

darshanasbg · Apr 4, 2012 · 168aa47 · 168aa47
2 parents 8bcf725 + ac82ba0
commit 168aa47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 3.4.11.0 (not yet released)
 - bug #3486970 [import] Exception on XML import
 - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
+- bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click
 
 3.4.10.2 (2012-03-28)
 - [security] Fixed local path disclosure vulnerability, see PMASA-2012-2

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -265,7 +265,7 @@ static public function isMerge($db = null, $table = null)
     static public function sGetToolTip($db, $table)
     {
         return PMA_Table::sGetStatusInfo($db, $table, 'Comment')
-            . ' (' . PMA_Table::countRecords($db, $table) . ')';
+            . ' (' . PMA_Table::countRecords($db, $table) . ' ' . __('Rows') . ')';
     }
 
     /**