[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1520-g5f85bb0

[Marc Delisle]

The branch, master has been updated
       via  5f85bb0e831cf4b72f922e7b5fff86156098da2e (commit)
      from  5fdf725d5bd29838e56ca512a6b4352bea613717 (commit)


- Log -----------------------------------------------------------------
commit 5f85bb0e831cf4b72f922e7b5fff86156098da2e
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed May 18 07:45:58 2011 -0400

    Remove redundancy from message

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

Summary of changes:
 libraries/check_user_privileges.lib.php   |    2 +-
 libraries/display_create_database.lib.php |    4 ++--
 server_databases.php                      |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 6dbc251..fee3b62 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -136,7 +136,7 @@ function PMA_analyseShowGrant()
 
                     /**
                      * @todo collect $GLOBALS['db_to_create'] into an array, to display a
-                     * drop-down in the "Create new database" dialog
+                     * drop-down in the "Create database" dialog
                      */
                      // we don't break, we want all possible databases
                      //break;
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 07db1f7..02c05df 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -18,7 +18,7 @@ if ($is_create_db_priv) {
     // The user is allowed to create a db
     ?>
         <form method="post" action="db_create.php" id="create_database_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax" ' : ''); ?>><strong>
-            <?php echo '<label for="text_create_db">' . __('Create new database') . '</label> ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
+            <?php echo '<label for="text_create_db">' . __('Create database') . '</label> ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
             <?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
             <input type="hidden" name="reload" value="1" />
             <input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
@@ -36,7 +36,7 @@ if ($is_create_db_priv) {
 } else {
     ?>
     <!-- db creation no privileges message -->
-        <strong><?php echo __('Create new database') . ': ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
+        <strong><?php echo __('Create database') . ': ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
         <?php
               echo '<span class="noPrivileges">'
                  . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" alt="" width="11" height="11" hspace="2" border="0" align="middle" />' : '')
diff --git a/server_databases.php b/server_databases.php
index aba73e7..a4fbf89 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -101,7 +101,7 @@ echo '<h2>' . "\n"
    .'</h2>' . "\n";
 
 /**
- * Create new database.
+ * Create database.
  */
 if ($cfg['ShowCreateDb']) {
     echo '<ul><li id="li_create_database">' . "\n";


hooks/post-receive
-- 
phpMyAdmin