[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2946-gda46a09

[Marc Delisle]

The branch, master has been updated
       via  da46a09c2497f22766fff7d552904af52c8f83e8 (commit)
      from  ccc65dd6ba25549e22d0f881705d38641a52dfe5 (commit)


- Log -----------------------------------------------------------------
commit da46a09c2497f22766fff7d552904af52c8f83e8
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Jun 2 11:25:12 2011 -0400

    rfe #3310562 Wording about Column

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    1 +
 libraries/tbl_properties.inc.php |    2 +-
 tbl_structure.php                |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0509e04..dc76507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 + rfe #2098927 Remember recent tables
 + rfe #3078542 Remember the last sort order for each table
 + AJAX for Create table in navigation panel
++ rfe #3310562 Wording about Column
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 501e243..4f1b647 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -95,7 +95,7 @@ $is_backup = ($action != 'tbl_create.php' && $action != 'tbl_addfield.php');
 $header_cells = array();
 $content_cells = array();
 
-$header_cells[] = __('Column');
+$header_cells[] = __('Name');
 $header_cells[] = __('Type')
      . ($GLOBALS['cfg']['ReplaceHelpImg']
         ? PMA_showMySQLDocu('SQL-Syntax', 'data-types')
diff --git a/tbl_structure.php b/tbl_structure.php
index e2a436d..636150a 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -195,7 +195,7 @@ $i = 0;
 <tr>
     <th id="th<?php echo ++$i; ?>"></th>
     <th id="th<?php echo ++$i; ?>">#</th>
-    <th id="th<?php echo ++$i; ?>" class="column"><?php echo __('Column'); ?></th>
+    <th id="th<?php echo ++$i; ?>" class="column"><?php echo __('Name'); ?></th>
     <th id="th<?php echo ++$i; ?>" class="type"><?php echo __('Type'); ?></th>
     <th id="th<?php echo ++$i; ?>" class="collation"><?php echo __('Collation'); ?></th>
     <th id="th<?php echo ++$i; ?>" class="attributes"><?php echo __('Attributes'); ?></th>


hooks/post-receive
-- 
phpMyAdmin