[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-367-gf324012

[Marc Delisle]

The branch, master has been updated
       via  f324012ec11211b9d1536a842b433761b158ef53 (commit)
      from  d0c1c11719859aaad2443fc128eb7974c4911f86 (commit)


- Log -----------------------------------------------------------------
commit f324012ec11211b9d1536a842b433761b158ef53
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sun Jan 15 06:18:29 2012 -0500

    patch #3473635 Join messages

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

Summary of changes:
 libraries/display_tbl.lib.php |    2 +-
 libraries/import.lib.php      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 48ac01a..75698ad 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -683,7 +683,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
         // per SQL query, and at the same time have a default that displays
         // the transformations.
         echo '<div class="formelement">';
-        PMA_display_html_checkbox('hide_transformation', __('Hide') . ' ' . __('Browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
+        PMA_display_html_checkbox('hide_transformation', __('Hide browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
         echo '</div>';
 
         if (! PMA_DRIZZLE) {
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 3387406..d1785d4 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -1103,7 +1103,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
     $message .= '<li>' . __('Edit structure by following the "Structure" link') . '</li>';
     $message .= sprintf('<br /><li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __('Options') . '</a>)</li>',
                         $db_url,
-                        __('Go to database') . ': ' . htmlspecialchars(PMA_backquote($db_name)),
+                        sprintf(__('Go to database: %s'), htmlspecialchars(PMA_backquote($db_name))),
                         htmlspecialchars($db_name),
                         $db_ops_url,
                         sprintf(__('Edit settings for %s'), htmlspecialchars(PMA_backquote($db_name))));
@@ -1124,7 +1124,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
         if (! PMA_Table::isView($db_name, $tables[$i][TBL_NAME])) {
             $message .= sprintf('<li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __('Structure') . '</a>) (<a href="%s" title="%s">' . __('Options') . '</a>)</li>',
                                 $tbl_url,
-                                __('Go to table') . ': ' . htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME])),
+                                sprintf(__('Go to table: %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))),
                                 htmlspecialchars($tables[$i][TBL_NAME]),
                                 $tbl_struct_url,
                                 sprintf(__('Structure of %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))),
@@ -1133,7 +1133,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
         } else {
             $message .= sprintf('<li><a href="%s" title="%s">%s</a></li>',
                                 $tbl_url,
-                                __('Go to view') . ': ' . htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME])),
+                                sprintf(__('Go to view: %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))),
                                 htmlspecialchars($tables[$i][TBL_NAME]));
         }
     }


hooks/post-receive
-- 
phpMyAdmin