[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-176-ge53fa42

[Marc Delisle]

The branch, master has been updated
       via  e53fa429808bca3ac3631519a18b7c26761194a5 (commit)
      from  8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd (commit)


- Log -----------------------------------------------------------------
commit e53fa429808bca3ac3631519a18b7c26761194a5
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sun May 15 13:40:11 2011 -0400

    Patch #3302354 Add gettext wrappers around a message

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

Summary of changes:
 ChangeLog       |    1 +
 js/import.js    |    2 +-
 js/messages.php |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c9db95..f137943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 + "up to date" message on main page when current version is up to date
 + Update to jQuery 1.6.1
 + Patch #3256122 [search] Show/hide db search results
++ Patch #3302354 Add gettext wrappers around a message
 
 3.4.1.0 (not yet released)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/js/import.js b/js/import.js
index 0bcc3d0..8445716 100644
--- a/js/import.js
+++ b/js/import.js
@@ -16,7 +16,7 @@ function changePluginOpts() {
     var selected_plugin_name = $("#plugins option:selected").attr("value");
     $("#" + selected_plugin_name + "_options").fadeIn('slow');
     if(selected_plugin_name == "csv") {
-        $("#import_notification").text("Note: If the file contains multiple tables, they will be combined into one");
+        $("#import_notification").text(PMA_messages['strImportCSV']);
     } else {
         $("#import_notification").text("");
     }
diff --git a/js/messages.php b/js/messages.php
index 6d7b0e7..ee2b56c 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -86,6 +86,9 @@ $js_messages['strShowSearchResults'] = __('Show search results');
 //$js_messages['strBrowsing'] = __('Browsing');
 //$js_messages['strDeleting'] = __('Deleting');
 
+/* For import.js */
+$js_messages['strImportCSV'] = __('Note: If the file contains multiple tables, they will be combined into one');
+
 /* For sql.js */
 $js_messages['strHideQueryBox'] = __('Hide query box');
 $js_messages['strShowQueryBox'] = __('Show query box');


hooks/post-receive
-- 
phpMyAdmin