diff --git a/ChangeLog b/ChangeLog index 158e3309ad..9c9db95786 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host - Bug #3302457 Inline edit and $cfg['PropertiesIconic'] +- Patch #3302313 Show a translated label 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/libraries/import/csv.php b/libraries/import/csv.php index e41ea35bff..aaff1b1dcd 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -38,7 +38,7 @@ if (isset($plugin_list)) { } else { $hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.')); $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ' . PMA_showHint($hint))); + array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); } $plugin_list['csv']['options'][] = array('type' => 'end_group');