Merge remote branch 'origin/master'

2010-06-03 22:34:52 +05:30
parent 3bb4dbd0ac 5dfe98a378
commit 160f4314eb
120 changed files with 40225 additions and 32460 deletions
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -186,7 +186,7 @@ PMA_Message::warning(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b

 <table>
 <thead>
-<tr><th><?php echo __('Field'); ?></th>
+<tr><th><?php echo __('Column'); ?></th>
    <th><?php echo __('Size'); ?></th>
 </tr>
 </thead>