Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

libraries/messages.inc.php

@@ -555,7 +555,6 @@ $strMySQLSaid = __('MySQL said: ');
 $strMySQLShowProcess = __('Show processes');
 
 $strName = __('Name');
-$strNavTableFilter = __('Filter');
 $strNewTable = __('New table');
 $strNext = __('Next');
 $strNoActivity = __('No activity within %s seconds; please log in again');

navigation.php

@@ -14,8 +14,6 @@
  * @uses $GLOBALS['text_dir']
  * @uses $GLOBALS['charset']
  * @uses $GLOBALS['pmaThemeImage']
- * @uses $GLOBALS['strNavTableFilter']
- * @uses $GLOBALS['strReset']
  * @uses $GLOBALS['strNoDatabases']
  * @uses $GLOBALS['strDatabase']
  * @uses $GLOBALS['strGo']
@@ -317,8 +315,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
     if ($table_count) {
         ?>
         <span id="NavFilter">
-        <input type="text" name="fast_filter" id="fast_filter" title="<?php echo $strNavTableFilter; ?>" />
-        <span id="clear_fast_filter" title="<?php echo $strReset; ?>">X</span>
+        <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" />
+        <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span>
         </span>
         <?php
     }

themes/darkblue_orange/css/theme_right.css.php

@@ -1281,6 +1281,6 @@ table#serverconnection_trg_local  {
 }
 
 #fast_filter {
-    width: 90%;
+    width: 85%;
     padding: 0.1em;
 }

themes/original/css/theme_left.css.php

@@ -247,6 +247,6 @@ div#left_tableList ul ul {
 }
 
 #fast_filter {
-    width: 90%;
+    width: 85%;
     padding: 0.1em;
 }