[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-32-g6923cca

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  6923ccab3eb4f939cb584441a44f5537a6c4dd00 (commit)
      from  e5826013d7eb0138f3ca7f79c699ee6b00c0c997 (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |    1 +
 libraries/import/csv.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3ad38c..8ac4491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,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
-- 
phpMyAdmin