[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5771-g3e57a8e

Michal Čihař nijel at users.sourceforge.net
Tue Jul 20 15:06:55 CEST 2010


The branch, master has been updated
       via  3e57a8eca92ddd1f8ff5803b20a8f3fa30190aaf (commit)
      from  907663959b30a7f269d722201599db6ed7b31347 (commit)


- Log -----------------------------------------------------------------
commit 3e57a8eca92ddd1f8ff5803b20a8f3fa30190aaf
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 15:06:34 2010 +0200

    No @uses __('Something').

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

Summary of changes:
 db_search.php                        |   17 -----------------
 index.php                            |    1 -
 libraries/Config.class.php           |    2 --
 libraries/File.class.php             |   10 ----------
 libraries/Index.class.php            |    1 -
 libraries/StorageEngine.class.php    |    6 ------
 libraries/Theme.class.php            |    3 ---
 libraries/auth/cookie.auth.lib.php   |   14 --------------
 libraries/common.lib.php             |   13 -------------
 libraries/core.lib.php               |    1 -
 libraries/db_info.inc.php            |    1 -
 libraries/db_structure.lib.php       |    8 --------
 libraries/dbi/mysql.dbi.lib.php      |    3 ---
 libraries/dbi/mysqli.dbi.lib.php     |    2 --
 libraries/display_tbl.lib.php        |    1 -
 libraries/engines/innodb.lib.php     |   25 -------------------------
 libraries/footer.inc.php             |    1 -
 libraries/relation.lib.php           |   13 -------------
 libraries/select_server.lib.php      |    2 --
 libraries/server_synchronize.lib.php |    7 -------
 libraries/sql_query_form.lib.php     |   19 -------------------
 navigation.php                       |    8 --------
 querywindow.php                      |    9 ---------
 server_binlog.php                    |   13 -------------
 tbl_create.php                       |    4 ----
 user_password.php                    |    7 -------
 26 files changed, 0 insertions(+), 191 deletions(-)

diff --git a/db_search.php b/db_search.php
index 6fd947d..e57c161 100644
--- a/db_search.php
+++ b/db_search.php
@@ -7,23 +7,6 @@
  * @todo    display executed query, optional?
  * @uses    $cfg['UseDbSearch']
  * @uses    $GLOBALS['db']
- * @uses    __('Access denied') 
- * @uses    __('at least one of the words') 
- * @uses    __('all words') 
- * @uses    __('the exact phrase') 
- * @uses    __('as regular expression') 
- * @uses    __('Search results for "<i>%s</i>" %s:') 
- * @uses    __('%s match(es) inside table <i>%s</i>') 
- * @uses    __('Browse')
- * @uses    __('Delete')
- * @uses    __('<b>Total:</b> <i>%s</i> match(es)') 
- * @uses    __('Search in database') 
- * @uses    __('Word(s) or value(s) to search for (wildcard: "%"):') 
- * @uses    __('Find:') 
- * @uses    __('Words are separated by a space character (" ").') 
- * @uses    __('Inside table(s):') 
- * @uses    __('Unselect All')
- * @uses    __('Select All') 
  * @uses    PMA_DBI_get_tables()
  * @uses    PMA_sqlAddslashes()
  * @uses    PMA_getSearchSqls()
diff --git a/index.php b/index.php
index 1aec410..3b16ec7 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,6 @@
 /**
  * forms frameset
  *
- * @uses    __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.')
  * @uses    $GLOBALS['cfg']['QueryHistoryDB']
  * @uses    $GLOBALS['cfg']['Server']['user']
  * @uses    $GLOBALS['cfg']['DefaultTabServer']     as src for the mainframe
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 5a31629..225977b 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -993,7 +993,6 @@ class PMA_Config
      * @uses    $GLOBALS['PMA_Config']
      * @uses    PMA_Config::get()
      * @uses    PMA_Config::_getFontsizeOptions()
-     * @uses    __('Font size')
      * @static
      * @param   string  $current_size   currently slected font size with unit
      * @return  string  html selectbox
@@ -1030,7 +1029,6 @@ class PMA_Config
      *
      * @uses    PMA_generate_common_hidden_inputs()
      * @uses    PMA_Config::_getFontsizeSelection()
-     * @uses    __('Go')
      * @static
      * @param   string  $current_size   currently slected font size with unit
      * @return  string  html selectbox
diff --git a/libraries/File.class.php b/libraries/File.class.php
index 2f0fecd..a6a515f 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -258,13 +258,6 @@ class PMA_File
      * @uses    PMA_File::setRecentBLOBReference()
      * @uses    curl_setopt_array()
      * @uses    PMA_File::$_error_message
-     * @uses    __('The uploaded file exceeds the upload_max_filesize directive in php.ini.')
-     * @uses    __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.')
-     * @uses    __('The uploaded file was only partially uploaded.')
-     * @uses    __('Missing a temporary folder.')
-     * @uses    __('Failed to write file to disk.')
-     * @uses    __('File upload stopped by extension.')
-     * @uses    __('Unknown error in file upload.')
      * @uses    $_FILES
      * @param   string  $key    a numeric key used to identify the different rows
      * @param   string  $primary_key
@@ -831,7 +824,6 @@ class PMA_File
     /**
      *
      * @access  public
-     * @uses    __('File could not be read')
      * @uses    PMA_File::setName()
      * @uses    PMA_securePath()
      * @uses    PMA_userDir()
@@ -880,7 +872,6 @@ class PMA_File
      * @todo move check of $cfg['TempDir'] into PMA_Config?
      * @access  public
      * @uses    $cfg['TempDir']
-     * @uses    __('Error moving the uploaded file, see [a at ./Documentation.html#faq1_11 at Documentation]FAQ 1.11[/a]')
      * @uses    PMA_File::isReadable()
      * @uses    PMA_File::getName()
      * @uses    PMA_File::setName()
@@ -936,7 +927,6 @@ class PMA_File
      *
      * @todo    move file read part into readChunk() or getChunk()
      * @todo    add support for compression plugins
-     * @uses    __('File could not be read')
      * @uses    PMA_File::$_compression to set it
      * @uses    PMA_File::getName()
      * @uses    fopen()
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 61d1211..f203389 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -538,7 +538,6 @@ class PMA_Index
     /**
      * Function to check over array of indexes and look for common problems
      *
-     * @uses    __('The indexes %1 and %2 seem to be equal and one of them could possibly be removed.')
      * @uses    is_string()
      * @uses    is_array()
      * @uses    count()
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index d0f6974..2ae125a 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -154,7 +154,6 @@ class PMA_StorageEngine
      * @uses    PMA_ENGINE_DETAILS_TYPE_SIZE
      * @uses    PMA_ENGINE_DETAILS_TYPE_NUMERIC
      * @uses    PMA_StorageEngine::getVariablesStatus()
-     * @uses    __('There is no detailed status information available for this storage engine.')
      * @uses    PMA_showHint()
      * @uses    PMA_formatByteDown()
      * @uses    PMA_formatNumber()
@@ -334,11 +333,6 @@ class PMA_StorageEngine
     /**
      * public String getSupportInformationMessage()
      *
-     * @uses    __('%s is the default storage engine on this MySQL server.')
-     * @uses    __('%s is available on this MySQL server.')
-     * @uses    __('%s has been disabled for this MySQL server.')
-     * @uses    __('This MySQL server does not support the %s storage engine.')
-     * @uses    __('This MySQL server does not support the %s storage engine.')
      * @uses    PMA_ENGINE_SUPPORT_DEFAULT
      * @uses    PMA_ENGINE_SUPPORT_YES
      * @uses    PMA_ENGINE_SUPPORT_DISABLED
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index c74ec7b..09f46e2 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -144,7 +144,6 @@ class PMA_Theme {
      * @uses    PMA_Theme::setImgPath()
      * @uses    PMA_Theme::getName()
      * @uses    $GLOBALS['cfg']['ThemePath']
-     * @uses    __('No valid image path for theme %s found!')
      * @uses    is_dir()
      * @uses    sprintf()
      */
@@ -356,8 +355,6 @@ class PMA_Theme {
      * @uses    PMA_Theme::getVersion()
      * @uses    PMA_Theme::getId()
      * @uses    PMA_Theme::getPath()
-     * @uses    __('No preview available.')
-     * @uses    __('take it')
      * @uses    PMA_generate_common_url()
      * @uses    addslashes()
      * @uses    file_exists()
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 833703c..b40f7a2 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -114,17 +114,6 @@ function PMA_get_blowfish_secret() {
  * @uses    $GLOBALS['target']
  * @uses    $GLOBALS['db']
  * @uses    $GLOBALS['table']
- * @uses    __('Welcome to %s')
- * @uses    __('The configuration file now needs a secret passphrase (blowfish_secret).')
- * @uses    __('Error')
- * @uses    __('Log in')
- * @uses    __('Server:')
- * @uses    __('Username:')
- * @uses    __('Password:')
- * @uses    __('Server Choice')
- * @uses    __('Go')
- * @uses    __('Cookies must be enabled past this point.')
- * @uses    __('phpMyAdmin documentation')
  * @uses    $GLOBALS['pmaThemeImage']
  * @uses    $cfg['Servers']
  * @uses    $cfg['LoginCookieRecall']
@@ -643,9 +632,6 @@ function PMA_auth_set_user()
  *
  * @uses    $GLOBALS['server']
  * @uses    $GLOBALS['allowDeny_forbidden']
- * @uses    __('Access denied')
- * @uses    __('No activity within %s seconds; please log in again')
- * @uses    __('Cannot log in to the MySQL server')
  * @uses    $GLOBALS['no_activity']
  * @uses    $cfg['LoginCookieValidity']
  * @uses    $GLOBALS['PMA_Config']->removeCookie()
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 5bea0db..3302658 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -129,7 +129,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
 /**
  * Displays the maximum size for an upload
  *
- * @uses    __('Max: %s%s')
  * @uses    PMA_formatByteDown()
  * @uses    sprintf()
  * @param   integer  the size
@@ -345,7 +344,6 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
  * @uses    $cfg['MySQLManualType']
  * @uses    $cfg['MySQLManualBase']
  * @uses    $cfg['ReplaceHelpImg']
- * @uses    __('Documentation')
  * @uses    $GLOBALS['pmaThemeImage']
  * @uses    PMA_MYSQL_INT_VERSION
  * @uses    strtolower()
@@ -500,11 +498,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
  * @uses    footer.inc.php
  * @uses    header.inc.php
  * @uses    $GLOBALS['sql_query']
- * @uses    __('Error')
- * @uses    __('SQL query')
  * @uses    $GLOBALS['pmaThemeImage']
- * @uses    __('Edit')
- * @uses    __('MySQL said: ')
  * @uses    $GLOBALS['cfg']['PropertiesIconic']
  * @uses    $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
  * @uses    PMA_backquote()
@@ -1613,8 +1607,6 @@ function PMA_localisedDate($timestamp = -1, $format = '')
  * If the variables $link and $args ar left empty, an inactive tab is created
  *
  * @uses    $GLOBALS['PMA_PHP_SELF']
- * @uses    __('Empty')
- * @uses    __('Drop')
  * @uses    $GLOBALS['active_page']
  * @uses    $GLOBALS['url_query']
  * @uses    $cfg['MainPageIconic']
@@ -1881,7 +1873,6 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
 /**
  * Returns a given timespan value in a readable format.
  *
- * @uses    __('%s days, %s hours, %s minutes and %s seconds')
  * @uses    sprintf()
  * @uses    floor()
  * @param  int     the timespan
@@ -2190,7 +2181,6 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
  * Generate a pagination selector for browsing resultsets
  *
  * @todo $url is not javascript escaped!?
- * @uses    __('Page number:')
  * @uses    range()
  * @param   string      URL for the JavaScript
  * @param   string      Number of rows in the pagination set
@@ -2294,7 +2284,6 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
  * Generate navigation for a list
  *
  * @todo    use $pos from $_url_params
- * @uses    __('Page number:')
  * @uses    range()
  * @param   integer     number of elements in the list
  * @param   integer     current position in the list
@@ -2405,7 +2394,6 @@ function PMA_userDir($dir)
  *
  * @uses    $cfg['DefaultTabDatabase']
  * @uses    $GLOBALS['db']
- * @uses    __('Jump to database "%s".')
  * @uses    PMA_generate_common_url()
  * @uses    PMA_unescape_mysql_wildcards()
  * @uses    strlen()
@@ -2435,7 +2423,6 @@ function PMA_getDbLink($database = null)
  * that affects a functionality
  *
  * @uses    PMA_MYSQL_INT_VERSION
- * @uses    __('The %s functionality is affected by a known bug, see %s')
  * @uses    PMA_showHint()
  * @uses    sprintf()
  * @param   string  $functionality localized message explaining the func.
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index a4746e2..4b50b50 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -201,7 +201,6 @@ function PMA_securePath($path)
  * @todo    use detected argument separator (PMA_Config)
  * @uses    $GLOBALS['session_name']
  * @uses    $GLOBALS['text_dir']
- * @uses    __('Error')
  * @uses    $GLOBALS['available_languages']
  * @uses    $GLOBALS['lang']
  * @uses    $GLOBALS['PMA_Config']->removeCookie()
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 2d5652b..969af04 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -58,7 +58,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
  * fills given tooltip arrays
  *
  * @uses    $cfg['ShowTooltipAliasTB']
- * @uses    __('Creation')
  * @uses    PMA_localisedDate()
  * @uses    strtotime()
  * @param   array   $tooltip_truename   tooltip data
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
index c938ce0..6f91d44 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -16,14 +16,6 @@ if (! defined('PHPMYADMIN')) {
  * @uses    PMA_showHint()
  * @uses    $GLOBALS['cfg']['PropertiesNumColumns']
  * @uses    $GLOBALS['is_show_stats']
- * @uses    __('Table')
- * @uses    __('Action')
- * @uses    __('Rows')
- * @uses    __('May be approximate. See [a at ./Documentation.html#faq3_11 at Documentation]FAQ 3.11[/a]')
- * @uses    __('Type')
- * @uses    __('Collation')
- * @uses    __('Size')
- * @uses    __('Overhead')
  * @uses    $GLOBALS['colspan_for_structure']
  * @uses    PMA_SortableTableHeader()
  * @param   boolean $db_is_information_schema
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index c9442ed..fdd83f8 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -307,9 +307,6 @@ function PMA_DBI_get_client_info()
  * @uses    PMA_DBI_convert_message()
  * @uses    $GLOBALS['errno']
  * @uses    $GLOBALS['userlink']
- * @uses    __('The server is not responding')
- * @uses    __('(or the local MySQL server's socket is not correctly configured)')
- * @uses    __('Details...')
  * @uses    mysql_errno()
  * @uses    mysql_error()
  * @uses    defined()
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0fb46c2..de90cac 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -363,8 +363,6 @@ function PMA_DBI_get_client_info()
  * @uses    PMA_DBI_convert_message()
  * @uses    $GLOBALS['errno']
  * @uses    $GLOBALS['userlink']
- * @uses    __('The server is not responding')
- * @uses    __('(or the local MySQL server's socket is not correctly configured)')
  * @uses    mysqli_errno()
  * @uses    mysqli_error()
  * @uses    mysqli_connect_errno()
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 682ff4c..5bd2870 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2308,7 +2308,6 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
  * @uses    PMA_DBI_try_query()
  * @uses    PMA_DBI_num_rows()
  * @uses    PMA_DBI_fetch_row()
- * @uses    __('Link not found')
  * @uses    PMA_DBI_free_result()
  * @uses    $GLOBALS['printview']
  * @uses    htmlspecialchars()
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index be76a40..dfdc5da 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -11,13 +11,6 @@
 class PMA_StorageEngine_innodb extends PMA_StorageEngine
 {
     /**
-     * @uses    __('Data home directory')
-     * @uses    __('The common part of the directory path for all InnoDB data files.')
-     * @uses    __('Data files')
-     * @uses    __('Autoextend increment')
-     * @uses    __(' The increment size for extending the size of an autoextending tablespace when it becomes full.')
-     * @uses    __('Buffer pool size')
-     * @uses    __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.')
      * @uses    PMA_ENGINE_DETAILS_TYPE_NUMERIC
      * @uses    PMA_ENGINE_DETAILS_TYPE_SIZE
      * @return  array
@@ -130,8 +123,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
     /**
      * @uses    $this->support
      * @uses    PMA_ENGINE_SUPPORT_YES
-     * @uses    __('Buffer Pool')
-     * @uses    __('InnoDB Status')
      * @return  array   detail pages
      */
     function getInfoPages()
@@ -151,22 +142,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
      * @uses    PMA_DBI_fetch_result()
      * @uses    PMA_formatNumber()
      * @uses    PMA_formatByteDown()
-     * @uses    __('Buffer Pool Usage')
-     * @uses    __('Total')
-     * @uses    __('pages')
-     * @uses    __('Free pages')
-     * @uses    __('Dirty pages')
-     * @uses    __('Pages containing data')
-     * @uses    __('Pages to be flushed')
-     * @uses    __('Busy pages')
-     * @uses    __('Latched pages')
-     * @uses    __('Buffer Pool Activity')
-     * @uses    __('Read requests')
-     * @uses    __('Write requests')
-     * @uses    __('Read misses')
-     * @uses    __('Write waits')
-     * @uses    __('Read misses in %')
-     * @uses    __('Write waits in %')
      * @uses    join()
      * @uses    htmlspecialchars()
      * @uses    PMA_formatNumber()
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index b117779..b018549 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -31,7 +31,6 @@
  * @uses    $cfg['NavigationBarIconic']
  * @uses    $cfg['DBG']['enable']
  * @uses    $cfg['DBG']['profile']['enable']
- * @uses    __('Open new phpMyAdmin window')
  * @uses    $cfg['MaxCharactersInDisplayedSQL']
  * @uses    PMA_isValid()
  * @uses    PMA_setHistory()
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 36f02b0..cb8a23e 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -71,18 +71,6 @@ function PMA_getRelationsParam($verbose = false)
  *
  * @uses    $GLOBALS['server']
  * @uses    $GLOBALS['controllink']
- * @uses    __('not OK')
- * @uses    __('Documentation')
- * @uses    __('General relation features')
- * @uses    __('Disabled')
- * @uses    __('Enabled')
- * @uses    __('Display Features')
- * @uses    __('Creation of PDFs')
- * @uses    __('Displaying Column Comments')
- * @uses    __('Bookmarked SQL query')
- * @uses    __('Please see the documentation on how to update your column_comments table')
- * @uses    __('SQL history')
- * @uses    __('Designer')
  * @uses    $cfg['Server']['pmadb']
  * @uses    sprintf()
  * @uses    PMA_printDiagMessageForFeature()
@@ -1153,7 +1141,6 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
 /**
  * Create a PDF page
  *
- * @uses    __('no description')
  * @uses    PMA_backquote()
  * @uses    $GLOBALS['cfgRelation']['db']
  * @uses    PMA_sqlAddslashes()
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 602b63c..e6804fc 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -10,9 +10,7 @@
  * display server selection in list or selectbox form, or option tags only
  *
  * @uses    $GLOBALS['cfg']['DisplayServersList']
- * @uses    __('Server')
  * @uses    $GLOBALS['cfg']['Servers']
- * @uses    __('Go')
  * @uses    implode()
  * @uses    htmlspecialchars()
  * @uses    PMA_generate_common_hidden_inputs()
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index a1822f9..c7d8121 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1324,10 +1324,6 @@ function PMA_displayQuery($query) {
 
 /**
  * PMA_syncDisplayHeaderSource() shows the header for source database 
- * @uses   __('Source database') 
- * @uses   __('Difference') 
- * @uses   __('Current server') 
- * @uses   __('Remote server') 
  * @uses   $_SESSION['src_type'] 
  * @uses   $_SESSION['src_server']['host'] 
  *
@@ -1351,9 +1347,6 @@ function PMA_syncDisplayHeaderSource($src_db) {
 
 /**
  * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables
- * @uses   __('Target database') 
- * @uses   __('Current server') 
- * @uses   __('Remote server') 
  * @uses   $_SESSION['trg_type'] 
  * @uses   $_SESSION['trg_server']['host'] 
  * 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 68574cb..faa563a 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -43,7 +43,6 @@ require_once './libraries/bookmark.lib.php'; // used for file listing
  * @uses    $GLOBALS['cfg']['DefaultQueryDatabase']
  * @uses    $GLOBALS['cfg']['DefaultQueryTable']
  * @uses    $GLOBALS['cfg']['Bookmark']
- * @uses    __('Your SQL query has been executed successfully')
  * @uses    PMA_generate_common_url()
  * @uses    PMA_backquote()
  * @uses    PMA_DBI_fetch_result()
@@ -184,8 +183,6 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
  * @uses    $GLOBALS['cfg']['TextareaAutoSelect']
  * @uses    $GLOBALS['cfg']['TextareaCols']
  * @uses    $GLOBALS['cfg']['TextareaRows']
- * @uses    __(' Show this query here again ')
- * @uses    __('Go')
  * @uses    PMA_USR_OS
  * @uses    PMA_USR_BROWSER_AGENT
  * @uses    PMA_USR_BROWSER_VER
@@ -404,13 +401,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
  * @uses    $GLOBALS['db']
  * @uses    $GLOBALS['pmaThemeImage']
  * @uses    $GLOBALS['cfg']['ReplaceHelpImg']
- * @uses    __('Bookmarked SQL query')
- * @uses    __('View only')
- * @uses    __('Delete')
- * @uses    __('Documentation')
- * @uses    __('Go')
- * @uses    __('Submit')
- * @uses    __('Variable')
  * @uses    count()
  * @uses    htmlspecialchars()
  */
@@ -480,15 +470,6 @@ function PMA_sqlQueryFormBookmark()
  * @uses    $GLOBALS['cfg']['BZipDump']
  * @uses    $GLOBALS['cfg']['UploadDir']
  * @uses    $GLOBALS['cfg']['AvailableCharsets']
- * @uses    __('bzipped')
- * @uses    __('Character set of the file:')
- * @uses    __('Compression')
- * @uses    __('Error')
- * @uses    __('Go')
- * @uses    __('gzipped')
- * @uses    __('Location of the text file')
- * @uses    __('web server upload directory')
- * @uses    __('The directory you set for upload work cannot be reached')
  * @uses    $GLOBALS['charset']
  * @uses    $GLOBALS['max_upload_size']
  * @uses    PMA_supportedDecompressions()
diff --git a/navigation.php b/navigation.php
index 06581cc..17cb587 100644
--- a/navigation.php
+++ b/navigation.php
@@ -13,11 +13,6 @@
  * @uses $GLOBALS['text_dir']
  * @uses $GLOBALS['charset']
  * @uses $GLOBALS['pmaThemeImage']
- * @uses __('No databases')
- * @uses __('Database')
- * @uses __('Go')
- * @uses __('Please select a database')
- * @uses __('No tables found in database.')
  * @uses $GLOBALS['cfg']['LeftFrameLight']
  * @uses $GLOBALS['cfg']['ShowTooltip']
  * @uses $GLOBALS['cfg']['ShowTooltipAliasDB']
@@ -351,7 +346,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
  *
  * @uses    $_REQUEST['dbgroup']
  * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
- * @uses    __('Please select a database')
  * @uses    strpos()
  * @uses    urlencode()
  * @uses    printf()
@@ -535,8 +529,6 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
  * @uses    $GLOBALS['cfg']['LeftFrameTableSeparator']
  * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
  * @uses    $GLOBALS['cfg']['DefaultTabTable']
- * @uses    __('Rows')
- * @uses    __('Browse')
  * @global  integer the element counter
  * @global  string  html code for '-' image
  * @global  string  html code for '+' image
diff --git a/querywindow.php b/querywindow.php
index dd2e39b..7b2b08d 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -12,15 +12,6 @@
  * @uses    $cfg['Confirm']
  * @uses    $GLOBALS['db']
  * @uses    $GLOBALS['table']
- * @uses    __('SQL')
- * @uses    __('Import files') 
- * @uses    __('SQL history') 
- * @uses    __('All')
- * @uses    __('Change')
- * @uses    __('Missing value in the form!') 
- * @uses    __('This is not a number!') 
- * @uses    __('"DROP DATABASE" statements are disabled.') 
- * @uses    __('Do you really want to ') 
  * @uses    PMA_isSuperuser()
  * @uses    PMA_outBufferPre()
  * @uses    PMA_getRelationsParam()
diff --git a/server_binlog.php b/server_binlog.php
index 71afc08..bfa4e07 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -8,19 +8,6 @@
  * @uses    $cfg['MaxRows']
  * @uses    $cfg['LimitChars']
  * @uses    $pmaThemeImage
- * @uses    __('Binary log')
- * @uses    __('Go')
- * @uses    __('Truncate Shown Queries')
- * @uses    __('Show Full Queries')
- * @uses    __('Log name')
- * @uses    __('Position')
- * @uses    __('Event type')
- * @uses    __('Server ID')
- * @uses    __('Original position')
- * @uses    __('Information')
- * @uses    __('Files')
- * @uses    __('Previous')
- * @uses    __('Next')
  * @uses    $binary_logs
  * @uses    PMA_generate_common_hidden_inputs()
  * @uses    PMA_generate_common_url()
diff --git a/tbl_create.php b/tbl_create.php
index 8856788..8f77bb3 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -4,10 +4,6 @@
  * @uses    $cfg['DefaultTabDatabase']
  * @uses    $GLOBALS['table']
  * @uses    $GLOBALS['db']
- * @uses    __('The table name is empty!')
- * @uses    __('Table %s already exists!')
- * @uses    __('Table')
- * @uses    __('Table %1 has been created.')
  * @uses    PMA_Table::generateFieldSpec()
  * @uses    PMA_checkParameters()
  * @uses    PMA_generateCharsetQueryPart()
diff --git a/user_password.php b/user_password.php
index 6cb795a..89bc138 100644
--- a/user_password.php
+++ b/user_password.php
@@ -4,14 +4,7 @@
  * displays and handles the form where the user can change his password
  * linked from main.php
  *
- * @uses    __('The profile has been updated.')
- * @uses    __('Back')
  * @uses    $GLOBALS['js_include']
- * @uses    __('Change password')
- * @uses    __('The password is empty!')
- * @uses    __('The passwords aren't the same!')
- * @uses    __('Error')
- * @uses    __('You don\'t have sufficient privileges to be here right now!')
  * @uses    $cfg['ShowChgPassword']
  * @uses    $cfg['Server']['auth_type']
  * @uses    PMA_DBI_select_db()


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list