The branch, master has been updated via 8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd (commit) via 6923ccab3eb4f939cb584441a44f5537a6c4dd00 (commit) from 4d3d5eb46d43074b6690b7d6b51596f108288edd (commit)
- Log ----------------------------------------------------------------- commit 8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd Merge: 4d3d5eb46d43074b6690b7d6b51596f108288edd 6923ccab3eb4f939cb584441a44f5537a6c4dd00 Author: Marc Delisle marc@infomarc.info Date: Sun May 15 13:24:42 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/import/csv.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 158e330..9c9db95 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 e41ea35..aaff1b1 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');
hooks/post-receive
-
Marc Delisle