Merge remote branch 'origin/master'

1 files changed, 2 insertions, 2 deletions

diff --git a/tbl_relation.php b/tbl_relation.php
index c9dbc434fb..5ca5ed54ee 100755
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -399,7 +399,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
     <legend><?php echo __('Relations'); ?></legend>
 
     <table>
-    <tr><th><?php echo __('Field'); ?></th>
+    <tr><th><?php echo __('Column'); ?></th>
     <?php
     if ($cfgRelation['relwork']) {
         echo '<th>' . __('Internal relation');
@@ -545,7 +545,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
         $disp = PMA_getDisplayField($db, $table);
         ?>
     <fieldset>
-        <label><?php echo __('Choose field to display') . ': '; ?></label>
+        <label><?php echo __('Choose column to display') . ': '; ?></label>
         <select name="display_field">
             <option value="">---</option>
         <?php